@@ -39,6 +39,10 @@ clang-format -i -verbose shared/*.c

 clang-format -i -verbose shared/*.h

 clang-format -i -verbose sigtool/*.c

 clang-format -i -verbose sigtool/*.h

+clang-format -i -verbose clamonacc/*.c

+clang-format -i -verbose clamonacc/*.h

+clang-format -i -verbose clamonacc/*/*.c

+clang-format -i -verbose clamonacc/*/*.h

 clang-format -i -verbose unit_tests/*.c

 clang-format -i -verbose unit_tests/*.h

 clang-format -i -verbose win32/compat/*.c

@@ -71,3 +75,5 @@ git checkout libclamav/inflate64.h

 git checkout libclamav/inflate64.c

 git checkout libclamav/inflate64_priv.h

 git checkout shared/queue.h

+git checkout clamonacc/c-thread-pool/thpool.c

+git checkout clamonacc/c-thread-pool/thpool.h

@@ -49,7 +49,6 @@

 #define CMD23 "GET / HTTP/2"

 #define CMD24 ""

-

 #include "libclamav/clamav.h"

 #include "shared/optparser.h"

 #include "server.h"

@@ -53,8 +53,7 @@

 #include "inotif/inotif.h"

 #include "scan/queue.h"

-

-pthread_t ddd_pid = 0;

+pthread_t ddd_pid        = 0;

 pthread_t scan_queue_pid = 0;

 static void onas_handle_signals();

@@ -63,202 +62,203 @@ static struct onas_context *g_ctx = NULL;

 static void onas_clamonacc_exit(int sig)

 {

-	logg("*Clamonacc: onas_clamonacc_exit(), signal %d\n", sig);

-	if (sig == 11) {

-		logg("!Clamonacc: clamonacc has experienced a fatal error, if you continue to see this error, please run clamonacc with --debug and report the issue and crash report to the developpers\n");

-	}

-

-	if (g_ctx) {

-		if(g_ctx->fan_fd) {

-			close(g_ctx->fan_fd);

-		}

-		g_ctx->fan_fd = 0;

-	}

-

-	logg("*Clamonacc: attempting to stop event consumer thread ...\n");

-	if (scan_queue_pid > 0) {

-		pthread_cancel(scan_queue_pid);

-		pthread_join(scan_queue_pid, NULL);

-	}

-	scan_queue_pid = 0;

-

-	logg("*Clamonacc: attempting to stop ddd thread ... \n");

-	if (ddd_pid > 0) {

-		pthread_cancel(ddd_pid);

-		pthread_join(ddd_pid, NULL);

-	}

-	ddd_pid = 0;

-

-	logg("Clamonacc: stopped\n");

-	onas_cleanup(g_ctx);

-	pthread_exit(NULL);

+    logg("*Clamonacc: onas_clamonacc_exit(), signal %d\n", sig);

+    if (sig == 11) {

+        logg("!Clamonacc: clamonacc has experienced a fatal error, if you continue to see this error, please run clamonacc with --debug and report the issue and crash report to the developpers\n");

+    }

+

+    if (g_ctx) {

+        if (g_ctx->fan_fd) {

+            close(g_ctx->fan_fd);

+        }

+        g_ctx->fan_fd = 0;

+    }

+

+    logg("*Clamonacc: attempting to stop event consumer thread ...\n");

+    if (scan_queue_pid > 0) {

+        pthread_cancel(scan_queue_pid);

+        pthread_join(scan_queue_pid, NULL);

+    }

+    scan_queue_pid = 0;

+

+    logg("*Clamonacc: attempting to stop ddd thread ... \n");

+    if (ddd_pid > 0) {

+        pthread_cancel(ddd_pid);

+        pthread_join(ddd_pid, NULL);

+    }

+    ddd_pid = 0;

+

+    logg("Clamonacc: stopped\n");

+    onas_cleanup(g_ctx);

+    pthread_exit(NULL);

 }

 int main(int argc, char **argv)

 {

-	const struct optstruct *opts;

-	const struct optstruct *clamdopts;

-	struct onas_context *ctx;

-	int ret = 0;

-

-	/* Initialize context */

-	ctx = onas_init_context();

-	if(ctx == NULL) {

-		logg("!Clamonacc: can't initialize context\n");

-		return 2;

-	}

-

-	/* Parse out all our command line options */

-	opts = optparse(NULL, argc, argv, 1, OPT_CLAMONACC, OPT_CLAMSCAN, NULL);

-	if(opts == NULL) {

-		logg("!Clamonacc: can't parse command line options\n");

-		return 2;

-	}

-	ctx->opts = opts;

-

-        /* And our config file options */

-	clamdopts = optparse(optget(opts, "config-file")->strarg, 0, NULL, 1, OPT_CLAMD, 0, NULL);

-	if (clamdopts == NULL) {

-		logg("!Clamonacc: can't parse clamd configuration file %s\n", optget(opts, "config-file")->strarg);

-		return 2;

-	}

-	ctx->clamdopts = clamdopts;

-

-        /* Make sure we're good to begin spinup */

-        ret = startup_checks(ctx);

-        if (ret) {

-            goto clean_up;

-        }

+    const struct optstruct *opts;

+    const struct optstruct *clamdopts;

+    struct onas_context *ctx;

+    int ret = 0;

+

+    /* Initialize context */

+    ctx = onas_init_context();

+    if (ctx == NULL) {

+        logg("!Clamonacc: can't initialize context\n");

+        return 2;

+    }

+

+    /* Parse out all our command line options */

+    opts = optparse(NULL, argc, argv, 1, OPT_CLAMONACC, OPT_CLAMSCAN, NULL);

+    if (opts == NULL) {

+        logg("!Clamonacc: can't parse command line options\n");

+        return 2;

+    }

+    ctx->opts = opts;

+

+    /* And our config file options */

+    clamdopts = optparse(optget(opts, "config-file")->strarg, 0, NULL, 1, OPT_CLAMD, 0, NULL);

+    if (clamdopts == NULL) {

+        logg("!Clamonacc: can't parse clamd configuration file %s\n", optget(opts, "config-file")->strarg);

+        return 2;

+    }

+    ctx->clamdopts = clamdopts;

+

+    /* Make sure we're good to begin spinup */

+    ret = startup_checks(ctx);

+    if (ret) {

+        goto clean_up;

+    }

 #ifndef _WIN32

-        /* Daemonize if sanity checks are good to go */

-        if (!optget(ctx->opts, "foreground")->enabled) {

-            if (-1 == daemonize()) {

-                logg("!Clamonacc: could not daemonize\n");

-                return 2;

-            }

+    /* Daemonize if sanity checks are good to go */

+    if (!optget(ctx->opts, "foreground")->enabled) {

+        if (-1 == daemonize()) {

+            logg("!Clamonacc: could not daemonize\n");

+            return 2;

         }

+    }

 #endif

-	/* Setup our client */

-	switch(onas_setup_client(&ctx)) {

-		case CL_SUCCESS:

-			if (CL_SUCCESS == onas_check_client_connection(&ctx)) {

-				break;

-			}

-		case CL_BREAK:

-			ret = 0;

-			logg("*Clamonacc: not setting up client\n");

-			goto clean_up;

-			break;

-		case CL_EARG:

-		default:

-			logg("!Clamonacc: can't setup client\n");

-			ret = 2;

-			goto clean_up;

-			break;

-	}

-

-

-        /* Setup our event queue */

-        ctx->maxthreads = optget(ctx->clamdopts, "OnAccessMaxThreads")->numarg;

-

-        switch(onas_scan_queue_start(&ctx)) {

+    /* Setup our client */

+    switch (onas_setup_client(&ctx)) {

+        case CL_SUCCESS:

+            if (CL_SUCCESS == onas_check_client_connection(&ctx)) {

+                break;

+            }

+        case CL_BREAK:

+            ret = 0;

+            logg("*Clamonacc: not setting up client\n");

+            goto clean_up;

+            break;

+        case CL_EARG:

+        default:

+            logg("!Clamonacc: can't setup client\n");

+            ret = 2;

+            goto clean_up;

+            break;

+    }

+

+    /* Setup our event queue */

+    ctx->maxthreads = optget(ctx->clamdopts, "OnAccessMaxThreads")->numarg;

+

+    switch (onas_scan_queue_start(&ctx)) {

+        case CL_SUCCESS:

+            break;

+        case CL_BREAK:

+        case CL_EARG:

+        case CL_ECREAT:

+        default:

+            ret = 2;

+            logg("!Clamonacc: can't setup event consumer queue\n");

+            goto clean_up;

+            break;

+    }

+

+#if defined(FANOTIFY)

+    /* Setup fanotify */

+    switch (onas_setup_fanotif(&ctx)) {

+        case CL_SUCCESS:

+            break;

+        case CL_BREAK:

+            ret = 0;

+            goto clean_up;

+            break;

+        case CL_EARG:

+        default:

+            mprintf("!Clamonacc: can't setup fanotify\n");

+            ret = 2;

+            goto clean_up;

+            break;

+    }

+

+    if (ctx->ddd_enabled) {

+        /* Setup inotify and kickoff DDD system */

+        switch (onas_enable_inotif_ddd(&ctx)) {

             case CL_SUCCESS:

                 break;

             case CL_BREAK:

+                ret = 0;

+                goto clean_up;

+                break;

             case CL_EARG:

-            case CL_ECREAT:

             default:

+                mprintf("!Clamonacc: can't setup fanotify\n");

                 ret = 2;

-                logg("!Clamonacc: can't setup event consumer queue\n");

                 goto clean_up;

                 break;

         }

-

-#if defined(FANOTIFY)

-	/* Setup fanotify */

-	switch(onas_setup_fanotif(&ctx)) {

-		case CL_SUCCESS:

-			break;

-		case CL_BREAK:

-			ret = 0;

-			goto clean_up;

-			break;

-		case CL_EARG:

-		default:

-			mprintf("!Clamonacc: can't setup fanotify\n");

-			ret = 2;

-			goto clean_up;

-			break;

-	}

-

-	if (ctx->ddd_enabled) {

-		/* Setup inotify and kickoff DDD system */

-		switch(onas_enable_inotif_ddd(&ctx)) {

-			case CL_SUCCESS:

-				break;

-			case CL_BREAK:

-				ret = 0;

-				goto clean_up;

-				break;

-			case CL_EARG:

-			default:

-				mprintf("!Clamonacc: can't setup fanotify\n");

-				ret = 2;

-				goto clean_up;

-				break;

-		}

-	}

+    }

 #else

-	mprintf("!Clamonacc: currently, this application only runs on linux systems with fanotify enabled\n");

-	goto clean_up;

+    mprintf("!Clamonacc: currently, this application only runs on linux systems with fanotify enabled\n");

+    goto clean_up;

 #endif

-	/* Setup signal handling */

-	g_ctx = ctx;

-	onas_handle_signals();

+    /* Setup signal handling */

+    g_ctx = ctx;

+    onas_handle_signals();

-        logg("*Clamonacc: beginning event loops\n");

-	/*  Kick off event loop(s) */

-	ret = onas_start_eloop(&ctx);

+    logg("*Clamonacc: beginning event loops\n");

+    /*  Kick off event loop(s) */

+    ret = onas_start_eloop(&ctx);

-	/* Clean up */

+    /* Clean up */

 clean_up:

-	onas_cleanup(ctx);

-	exit(ret);

+    onas_cleanup(ctx);

+    exit(ret);

 }

-static void onas_handle_signals() {

-	sigset_t sigset;

-	struct sigaction act;

-

-	/* ignore all signals except SIGUSR1 */

-	sigfillset(&sigset);

-	sigdelset(&sigset, SIGUSR1);

-	sigdelset(&sigset, SIGUSR2);

-	/* The behavior of a process is undefined after it ignores a

+static void onas_handle_signals()

+{

+    sigset_t sigset;

+    struct sigaction act;

+

+    /* ignore all signals except SIGUSR1 */

+    sigfillset(&sigset);

+    sigdelset(&sigset, SIGUSR1);

+    sigdelset(&sigset, SIGUSR2);

+    /* The behavior of a process is undefined after it ignores a

 	 * SIGFPE, SIGILL, SIGSEGV, or SIGBUS signal */

-	sigdelset(&sigset, SIGFPE);

-	sigdelset(&sigset, SIGILL);

-	sigdelset(&sigset, SIGSEGV);

-	sigdelset(&sigset, SIGINT);

-	sigdelset(&sigset, SIGTERM);

+    sigdelset(&sigset, SIGFPE);

+    sigdelset(&sigset, SIGILL);

+    sigdelset(&sigset, SIGSEGV);

+    sigdelset(&sigset, SIGINT);

+    sigdelset(&sigset, SIGTERM);

 #ifdef SIGBUS

-	sigdelset(&sigset, SIGBUS);

+    sigdelset(&sigset, SIGBUS);

 #endif

-	pthread_sigmask(SIG_SETMASK, &sigset, NULL);

-	memset(&act, 0, sizeof(struct sigaction));

-	act.sa_handler = onas_clamonacc_exit;

-	sigfillset(&(act.sa_mask));

-	sigaction(SIGUSR2, &act, NULL);

-	sigaction(SIGTERM, &act, NULL);

-	sigaction(SIGSEGV, &act, NULL);

-	sigaction(SIGINT, &act, NULL);

+    pthread_sigmask(SIG_SETMASK, &sigset, NULL);

+    memset(&act, 0, sizeof(struct sigaction));

+    act.sa_handler = onas_clamonacc_exit;

+    sigfillset(&(act.sa_mask));

+    sigaction(SIGUSR2, &act, NULL);

+    sigaction(SIGTERM, &act, NULL);

+    sigaction(SIGSEGV, &act, NULL);

+    sigaction(SIGINT, &act, NULL);

 }

-struct onas_context *onas_init_context(void) {

-    struct onas_context *ctx = (struct onas_context*) cli_malloc(sizeof(struct onas_context));

+struct onas_context *onas_init_context(void)

+{

+    struct onas_context *ctx = (struct onas_context *)cli_malloc(sizeof(struct onas_context));

     if (NULL == ctx) {

         return NULL;

     }

@@ -267,88 +267,91 @@ struct onas_context *onas_init_context(void) {

     return ctx;

 }

-cl_error_t onas_check_client_connection(struct onas_context **ctx) {

+cl_error_t onas_check_client_connection(struct onas_context **ctx)

+{

-	cl_error_t err = CL_SUCCESS;

+    cl_error_t err = CL_SUCCESS;

-	/* 0 local, non-zero remote, errno set on error */

-	(*ctx)->isremote = onas_check_remote(ctx, &err);

-	if (CL_SUCCESS == err ) {

-		logg("*Clamonacc: ");

-		(*ctx)->isremote ? logg("*daemon is remote\n") : logg("*daemon is local\n");

-	}

-	return err ? CL_EACCES : CL_SUCCESS;

+    /* 0 local, non-zero remote, errno set on error */

+    (*ctx)->isremote = onas_check_remote(ctx, &err);

+    if (CL_SUCCESS == err) {

+        logg("*Clamonacc: ");

+        (*ctx)->isremote ? logg("*daemon is remote\n") : logg("*daemon is local\n");

+    }

+    return err ? CL_EACCES : CL_SUCCESS;

 }

-int onas_start_eloop(struct onas_context **ctx) {

-	int ret = 0;

+int onas_start_eloop(struct onas_context **ctx)

+{

+    int ret = 0;

-	if (!ctx || !*ctx) {

-		mprintf("!Clamonacc: unable to start clamonacc. (bad context)\n");

-		return CL_EARG;

-	}

+    if (!ctx || !*ctx) {

+        mprintf("!Clamonacc: unable to start clamonacc. (bad context)\n");

+        return CL_EARG;

+    }

 #if defined(FANOTIFY)

-	ret = onas_fan_eloop(ctx);

+    ret = onas_fan_eloop(ctx);

 #endif

-	return ret;

+    return ret;

 }

-static int startup_checks(struct onas_context *ctx) {

+static int startup_checks(struct onas_context *ctx)

+{

 #if defined(FANOTIFY)

-	char faerr[128];

+    char faerr[128];

 #endif

-	int ret = 0;

-	cl_error_t err = CL_SUCCESS;

+    int ret        = 0;

+    cl_error_t err = CL_SUCCESS;

-	if(optget(ctx->opts, "help")->enabled) {

-		help();

-		ret = 2;

-		goto done;

-	}

+    if (optget(ctx->opts, "help")->enabled) {

+        help();

+        ret = 2;

+        goto done;

+    }

-	if(optget(ctx->opts, "version")->enabled) {

-		onas_print_server_version(&ctx);

-		ret = 2;

-		goto done;

-	}

+    if (optget(ctx->opts, "version")->enabled) {

+        onas_print_server_version(&ctx);

+        ret = 2;

+        goto done;

+    }

 #if defined(FANOTIFY)

-	ctx->fan_fd = fanotify_init(FAN_CLASS_CONTENT | FAN_UNLIMITED_QUEUE | FAN_UNLIMITED_MARKS, O_LARGEFILE | O_RDONLY);

-	if (ctx->fan_fd < 0) {

-		logg("!Clamonacc: fanotify_init failed: %s\n", cli_strerror(errno, faerr, sizeof(faerr)));

-		if (errno == EPERM) {

-			logg("!Clamonacc: clamonacc must have elevated permissions ... exiting ...\n");

-		}

-		ret = 2;

-		goto done;

-	}

+    ctx->fan_fd = fanotify_init(FAN_CLASS_CONTENT | FAN_UNLIMITED_QUEUE | FAN_UNLIMITED_MARKS, O_LARGEFILE | O_RDONLY);

+    if (ctx->fan_fd < 0) {

+        logg("!Clamonacc: fanotify_init failed: %s\n", cli_strerror(errno, faerr, sizeof(faerr)));

+        if (errno == EPERM) {

+            logg("!Clamonacc: clamonacc must have elevated permissions ... exiting ...\n");

+        }

+        ret = 2;

+        goto done;

+    }

 #endif

-	if (curl_global_init(CURL_GLOBAL_NOTHING)) {

-		ret = 2;

-		goto done;

-	}

-

-	if (0 == onas_check_remote(&ctx, &err)) {

-

-		if (CL_SUCCESS != err) {

-			logg("!Clamonacc: daemon is local, but a connection could not be established\n");

-			ret = 2;

-			goto done;

-		}

-

-		if(!optget(ctx->clamdopts, "OnAccessExcludeUID")->enabled &&

-				!optget(ctx->clamdopts, "OnAccessExcludeUname")->enabled && !optget(ctx->clamdopts, "OnAccessExcludeRootUID")->enabled) {

-			logg("!Clamonacc: at least one of OnAccessExcludeUID, OnAccessExcludeUname, or OnAccessExcludeRootUID must be specified ... it is reccomended you exclude the clamd instance UID or uname to prevent infinite event scanning loops\n");

-			ret = 2;

-			goto done;

-		}

-	}

+    if (curl_global_init(CURL_GLOBAL_NOTHING)) {

+        ret = 2;

+        goto done;

+    }

+

+    if (0 == onas_check_remote(&ctx, &err)) {

+

+        if (CL_SUCCESS != err) {

+            logg("!Clamonacc: daemon is local, but a connection could not be established\n");

+            ret = 2;

+            goto done;

+        }

+

+        if (!optget(ctx->clamdopts, "OnAccessExcludeUID")->enabled &&

+            !optget(ctx->clamdopts, "OnAccessExcludeUname")->enabled && !optget(ctx->clamdopts, "OnAccessExcludeRootUID")->enabled) {

+            logg("!Clamonacc: at least one of OnAccessExcludeUID, OnAccessExcludeUname, or OnAccessExcludeRootUID must be specified ... it is reccomended you exclude the clamd instance UID or uname to prevent infinite event scanning loops\n");

+            ret = 2;

+            goto done;

+        }

+    }

 done:

-	return ret;

+    return ret;

 }

 void help(void)

@@ -381,17 +384,18 @@ void help(void)

     exit(0);

 }

-void* onas_cleanup(struct onas_context *ctx) {

-	onas_context_cleanup(ctx);

-	logg_close();

+void *onas_cleanup(struct onas_context *ctx)

+{

+    onas_context_cleanup(ctx);

+    logg_close();

 }

-void* onas_context_cleanup(struct onas_context *ctx) {

-	close(ctx->fan_fd);

-	optfree((struct optstruct *) ctx->opts);

-	optfree((struct optstruct *) ctx->clamdopts);

-	ctx->opts = NULL;

-	ctx->clamdopts = NULL;

-	free(ctx);

+void *onas_context_cleanup(struct onas_context *ctx)

+{

+    close(ctx->fan_fd);

+    optfree((struct optstruct *)ctx->opts);

+    optfree((struct optstruct *)ctx->clamdopts);

+    ctx->opts      = NULL;

+    ctx->clamdopts = NULL;

+    free(ctx);

 }

-

@@ -41,31 +41,31 @@

 #endif

 struct onas_context {

-	const struct optstruct *opts;

-	const struct optstruct *clamdopts;

+    const struct optstruct *opts;

+    const struct optstruct *clamdopts;

-        int printinfected;

-        int maxstream;

+    int printinfected;

+    int maxstream;

-        uint32_t ddd_enabled;

+    uint32_t ddd_enabled;

-        int fan_fd;

-        uint64_t fan_mask;

-        uint8_t retry_on_error;

-        uint8_t retry_attempts;

-        uint8_t deny_on_error;

+    int fan_fd;

+    uint64_t fan_mask;

+    uint8_t retry_on_error;

+    uint8_t retry_attempts;

+    uint8_t deny_on_error;

-        uint64_t sizelimit;

-        uint64_t extinfo;

+    uint64_t sizelimit;

+    uint64_t extinfo;

-        int scantype;

-        int isremote;

-        int session;

-	int timeout;

+    int scantype;

+    int isremote;

+    int session;

+    int timeout;

-        int64_t portnum;

+    int64_t portnum;

-        int32_t maxthreads;

+    int32_t maxthreads;

 } __attribute__((packed));

 #ifdef HAVE_PRAGMA_PACK

@@ -75,13 +75,11 @@ struct onas_context {

 #pragma pack

 #endif

-struct onas_context* onas_init_context(void);

-void* onas_cleanup(struct onas_context *ctx);

-void* onas_context_cleanup(struct onas_context *ctx);

+struct onas_context *onas_init_context(void);

+void *onas_cleanup(struct onas_context *ctx);

+void *onas_context_cleanup(struct onas_context *ctx);

 cl_error_t onas_check_client_connection(struct onas_context **ctx);

 int onas_start_eloop(struct onas_context **ctx);

 void help(void);

-

-

 #endif

@@ -26,7 +26,7 @@

 #include <stdio.h>

 #include <stdlib.h>

 #include <curl/curl.h>

-#ifdef	HAVE_UNISTD_H

+#ifdef HAVE_UNISTD_H

 #include <unistd.h>

 #endif

 #include <string.h>

@@ -71,89 +71,87 @@ struct sockaddr_un nixsock;

 void onas_print_server_version(struct onas_context **ctx)

 {

-	if(onas_get_clamd_version(ctx)) {

-		/* can't get version from server, fallback */

-		printf("ClamAV %s\n", get_version());

-

-	}

+    if (onas_get_clamd_version(ctx)) {

+        /* can't get version from server, fallback */

+        printf("ClamAV %s\n", get_version());

+    }

 }

-

 /* Inits the communication layer

  * Returns 0 if clamd is local, non zero if clamd is remote */

-int onas_check_remote(struct onas_context  **ctx, cl_error_t *err) {

-	int s, ret;

-	const struct optstruct *opt;

-	CURL *curl;

-	CURLcode curlcode;

-	char *ipaddr = NULL;

-	struct addrinfo hints, *info, *p;

-	int res;

+int onas_check_remote(struct onas_context **ctx, cl_error_t *err)

+{

+    int s, ret;

+    const struct optstruct *opt;

+    CURL *curl;

+    CURLcode curlcode;

+    char *ipaddr = NULL;

+    struct addrinfo hints, *info, *p;

+    int res;

     int64_t timeout;

     timeout = optget((*ctx)->clamdopts, "OnAccessCurlTimeout")->numarg;

-

-	*err = CL_SUCCESS;

+    *err = CL_SUCCESS;

 #ifndef _WIN32

-	if((opt = optget((*ctx)->clamdopts, "LocalSocket"))->enabled) {

-		opt = optget((*ctx)->clamdopts, "LocalSocket");

-                (*ctx)->portnum = 0;

-		ret = 0;

-	} else {

-		opt = optget((*ctx)->clamdopts, "TCPAddr");

-                (*ctx)->portnum = optget((*ctx)->clamdopts, "TCPSocket")->numarg;

-		ret = 1;

-	}

+    if ((opt = optget((*ctx)->clamdopts, "LocalSocket"))->enabled) {

+        opt             = optget((*ctx)->clamdopts, "LocalSocket");

+        (*ctx)->portnum = 0;

+        ret             = 0;

+    } else {

+        opt             = optget((*ctx)->clamdopts, "TCPAddr");

+        (*ctx)->portnum = optget((*ctx)->clamdopts, "TCPSocket")->numarg;

+        ret             = 1;

+    }

 #else

-	if(!(opt = optget((*ctx)->clamdopts, "TCPSocket"))->enabled) {

-		return 0;

-	}

+    if (!(opt = optget((*ctx)->clamdopts, "TCPSocket"))->enabled) {

+        return 0;

+    }

 #endif

-	while (opt) {

+    while (opt) {

-		if (opt->strarg) {

-			ipaddr = (!strcmp(opt->strarg, "any") ? NULL : opt->strarg);

-		}

+        if (opt->strarg) {

+            ipaddr = (!strcmp(opt->strarg, "any") ? NULL : opt->strarg);

+        }

-		if (NULL == ipaddr) {

-			logg("!ClamClient: Clamonacc does not support binding to INADDR_ANY, \

+        if (NULL == ipaddr) {

+            logg("!ClamClient: Clamonacc does not support binding to INADDR_ANY, \

 					please specify an address with TCPAddr in your clamd.conf config file\n");

-			*err = CL_EARG;

-			return ret;

-		}

-

-		curlcode = onas_curl_init(&curl, ipaddr, (*ctx)->portnum, timeout);

-		if (CURLE_OK != curlcode) {

-			logg("!ClamClient: could not init curl, %s\n", curl_easy_strerror(curlcode));

-			*err = CL_EARG;

-			return ret;

-		}

-

-                curlcode = curl_easy_perform(curl);

-		if (CURLE_OK != curlcode) {

-			logg("!ClamClient: could not connect to remote clam daemon, %s\n", curl_easy_strerror(curlcode));

-			*err = CL_EARG;

-			return ret;

-		}

+            *err = CL_EARG;

+            return ret;

+        }

+

+        curlcode = onas_curl_init(&curl, ipaddr, (*ctx)->portnum, timeout);

+        if (CURLE_OK != curlcode) {

+            logg("!ClamClient: could not init curl, %s\n", curl_easy_strerror(curlcode));

+            *err = CL_EARG;

+            return ret;

+        }

+

+        curlcode = curl_easy_perform(curl);

+        if (CURLE_OK != curlcode) {

+            logg("!ClamClient: could not connect to remote clam daemon, %s\n", curl_easy_strerror(curlcode));

+            *err = CL_EARG;

+            return ret;

+        }

 #ifndef ONAS_DEBUG

-                if(onas_sendln(curl, "zPING", 5, timeout)) {

-			logg("!ClamClient: could not ping clamd, %s\n", curl_easy_strerror(curlcode));

-			*err = CL_EARG;

-                    curl_easy_cleanup(curl);

-                    return ret;

-                }

+        if (onas_sendln(curl, "zPING", 5, timeout)) {

+            logg("!ClamClient: could not ping clamd, %s\n", curl_easy_strerror(curlcode));

+            *err = CL_EARG;

+            curl_easy_cleanup(curl);

+            return ret;

+        }

 #endif

-		curl_easy_cleanup(curl);

+        curl_easy_cleanup(curl);

-		opt = opt->nextarg;

-	}

+        opt = opt->nextarg;

+    }

-	return ret;

+    return ret;

 }

 /**

@@ -164,104 +162,104 @@ int onas_check_remote(struct onas_context  **ctx, cl_error_t *err) {

  * @param port the port to use in case of TCP connection, set to 0 if connecting to a local socket

  * @param timeout time in ms to allow curl before timing out connection attempts

  */

-CURLcode onas_curl_init(CURL **curl, const char *ipaddr, int64_t port, int64_t timeout) {

-

-	CURLcode curlcode = CURLE_OK;

-

-	if (!curl || !ipaddr) {

-		logg("!ClamClient: invalid (NULL) args passed to onas_curl_init\n");

-		return CURLE_FAILED_INIT;

-	}

-

-	/* setup here, but caller needs to cleanup */

-	*curl = curl_easy_init();

-

-	if (!port) {

-

-		/* "ipaddr" is actually our unix socket path here */

-		curlcode = curl_easy_setopt(*curl, CURLOPT_UNIX_SOCKET_PATH, ipaddr);

-		if (CURLE_OK != curlcode) {

-			logg("!ClamClient: could not setup curl with local unix socket, %s\n", curl_easy_strerror(curlcode));

-			curl_easy_cleanup(*curl);

-			return curlcode;

-		}

-

-		curlcode = curl_easy_setopt(*curl, CURLOPT_URL, "http://localhost/");

-		if (CURLE_OK != curlcode) {

-			logg("!ClamClient: could not setup curl with local address, %s\n", curl_easy_strerror(curlcode));

-			curl_easy_cleanup(*curl);

-			return curlcode;

-		}

-

-	} else {

-

-		curlcode = curl_easy_setopt(*curl, CURLOPT_PORT, port);

-		if (CURLE_OK != curlcode) {

-			logg("!ClamClient: could not setup curl with tcp port, %s\n", curl_easy_strerror(curlcode));

-			curl_easy_cleanup(*curl);

-			return curlcode;

-		}

-

-		curlcode = curl_easy_setopt(*curl, CURLOPT_URL, ipaddr);

-		if (CURLE_OK != curlcode) {

-			logg("!ClamClient: could not setup curl with tcp address, %s\n", curl_easy_strerror(curlcode));

-			curl_easy_cleanup(*curl);

-			return curlcode;

-		}

+CURLcode onas_curl_init(CURL **curl, const char *ipaddr, int64_t port, int64_t timeout)

+{

+

+    CURLcode curlcode = CURLE_OK;

+

+    if (!curl || !ipaddr) {

+        logg("!ClamClient: invalid (NULL) args passed to onas_curl_init\n");

+        return CURLE_FAILED_INIT;

+    }

+