@@ -1,3 +1,8 @@

+Thu Nov 13 15:55:20 CET 2008 (tk)

+---------------------------------

+ * libclamav: drop options parameter in cl_engine_new(); replace cl_engine_dup()

+	      with cl_engine_addref()

+

 Thu Nov 13 14:59:39 CET 2008 (tk)

 ---------------------------------

  * libclamav/readdb.c: phishing_done() no longer needs to be called outside

@@ -3449,17 +3449,17 @@ clamfi_eom(SMFICTX *ctx)

 	if(!external) {

 		const char *virname;

-		struct cl_engine *tmp_engine;

+		int ret;

 		pthread_mutex_lock(&engine_mutex);

-		tmp_engine = cl_engine_dup(engine);

+		ret = cl_engine_addref(engine);

 		pthread_mutex_unlock(&engine_mutex);

-		if(!tmp_engine) {

-			logg("!cl_engine_dup failed\n");

+		if(ret != CL_SUCCESS) {

+			logg("!cl_engine_addref failed\n");

 			clamfi_cleanup(ctx);

 			return cl_error;

 		}

-		switch(cl_scanfile(privdata->filename, &virname, NULL, tmp_engine, options)) {

+		switch(cl_scanfile(privdata->filename, &virname, NULL, engine, options)) {

 			case CL_CLEAN:

 				if(logok)

 					logg("#%s: OK\n", privdata->filename);

@@ -3474,7 +3474,7 @@ clamfi_eom(SMFICTX *ctx)

 				logg("!%s\n", mess);

 				break;

 		}

-		cl_engine_free(tmp_engine);

+		cl_engine_free(engine); /* drop reference or free */

 #ifdef	SESSION

 		session = NULL;

@@ -5916,7 +5916,7 @@ loadDatabase(void)

 	signatures = 0;

 	pthread_mutex_lock(&engine_mutex);

 	if(engine) cl_engine_free(engine);

-	engine = cl_engine_new(CL_ENGINE_DEFAULT);

+	engine = cl_engine_new();

 	if (!engine) {

 		logg("!Can't initialize antivirus engine\n");

 		pthread_mutex_unlock(&engine_mutex);

@@ -309,7 +309,7 @@ int main(int argc, char **argv)

     else

 	logg("#Log file size limit disabled.\n");

-    if(!(engine = cl_engine_new(CL_ENGINE_DEFAULT))) {

+    if(!(engine = cl_engine_new())) {

 	logg("!Can't initialize antivirus engine\n");

 	logg_close();

 	freecfg(copt);

@@ -246,7 +246,7 @@ static struct cl_engine *reload_db(struct cl_engine *engine, unsigned int dbopti

 	return NULL;

     }

-    if(!(engine = cl_engine_new(CL_ENGINE_DEFAULT))) {

+    if(!(engine = cl_engine_new())) {

 	logg("!Can't initialize antivirus engine\n");

 	*ret = 1;

 	return NULL;

@@ -663,14 +663,23 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

 		    client_conn->sd = new_sd;

 		    client_conn->options = options;

 		    client_conn->copt = copt;

-		    client_conn->engine = cl_engine_dup(engine);

-		    client_conn->engine_timestamp = reloaded_time;

-		    client_conn->socketds = socketds;

-		    client_conn->nsockets = nsockets;

-		    if(!thrmgr_dispatch(thr_pool, client_conn)) {

+		    if(cl_engine_addref(engine)) {

 			closesocket(client_conn->sd);

 			free(client_conn);

-			logg("!thread dispatch failed\n");

+			logg("!cl_engine_addref() failed\n");

+			pthread_mutex_lock(&exit_mutex);

+			progexit = 1;

+			pthread_mutex_unlock(&exit_mutex);

+		    } else {

+			client_conn->engine = engine;

+			client_conn->engine_timestamp = reloaded_time;

+			client_conn->socketds = socketds;

+			client_conn->nsockets = nsockets;

+			if(!thrmgr_dispatch(thr_pool, client_conn)) {

+			    closesocket(client_conn->sd);

+			    free(client_conn);

+			    logg("!thread dispatch failed\n");

+			}

 		    }

 		} else {

 		    logg("!Can't allocate memory for client_conn\n");

@@ -382,7 +382,7 @@ int scanmanager(const struct optstruct *opt)

 	return 50;

     }

-    if(!(engine = cl_engine_new(CL_ENGINE_DEFAULT))) {

+    if(!(engine = cl_engine_new())) {

 	logg("!Can't initialize antivirus engine\n");

 	return 50;

     }

@@ -109,8 +109,7 @@ struct cl_engine;

 #define CL_INIT_DEFAULT	0x0

 extern int cl_init(unsigned int options);

-#define CL_ENGINE_DEFAULT   0x0

-extern struct cl_engine *cl_engine_new(unsigned int options);

+extern struct cl_engine *cl_engine_new(void);

 enum cl_engine_field {

     CL_ENGINE_MAX_SCANSIZE,	    /* uint64_t */

@@ -130,7 +129,7 @@ extern int cl_engine_get(const struct cl_engine *engine, enum cl_engine_field fi

 extern int cl_engine_compile(struct cl_engine *engine);

-extern struct cl_engine *cl_engine_dup(struct cl_engine *engine);

+extern int cl_engine_addref(struct cl_engine *engine);

 extern int cl_engine_free(struct cl_engine *engine);

@@ -10,7 +10,7 @@ CLAMAV_PUBLIC {

     cl_engine_set;

     cl_engine_get;

     cl_engine_compile;

-    cl_engine_dup;

+    cl_engine_addref;

     cl_engine_free;

     cl_load;

     cl_retdbdir;

@@ -237,7 +237,7 @@ int cl_init(unsigned int options)

     return CL_SUCCESS;

 }

-struct cl_engine *cl_engine_new(unsigned int options)

+struct cl_engine *cl_engine_new(void)

 {

 	struct cl_engine *new;

@@ -2049,11 +2049,11 @@ int cl_engine_compile(struct cl_engine *engine)

     return CL_SUCCESS;

 }

-struct cl_engine *cl_engine_dup(struct cl_engine *engine)

+int cl_engine_addref(struct cl_engine *engine)

 {

     if(!engine) {

-	cli_errmsg("cl_engine_dup: engine == NULL\n");

-	return NULL;

+	cli_errmsg("cl_engine_addref: engine == NULL\n");

+	return CL_ENULLARG;

     }

 #ifdef CL_THREAD_SAFE

@@ -2066,5 +2066,5 @@ struct cl_engine *cl_engine_dup(struct cl_engine *engine)

     pthread_mutex_unlock(&cli_ref_mutex);

 #endif

-    return engine;

+    return CL_SUCCESS;

 }

@@ -560,7 +560,7 @@ static int build(struct optstruct *opt)

     dbname = strstr(opt_arg(opt, "build"), "main") ? "main" : "daily";

-    if(!(engine = cl_engine_new(CL_ENGINE_DEFAULT))) {

+    if(!(engine = cl_engine_new())) {

 	mprintf("!build: Can't initialize antivirus engine\n");

 	return 50;

     }

@@ -281,7 +281,7 @@ static void psetup_impl(int load2)

 {

 	FILE *f;

 	int rc;

-	engine = cl_engine_new(CL_ENGINE_DEFAULT);

+	engine = cl_engine_new();

 	fail_unless(!!engine , "cl_engine_new");

 	phishing_init(engine);