@@ -1,3 +1,9 @@

+Wed Apr  1 20:19:00 EEST 2009 (edwin)

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

+ * clamd/server-th.c, clamd/thrmgr.c: Automatically fix MaxQueue

+ settings (bb #1521).  Also use rlim_cur instead of rlim_max, because

+ that is what the kernel enforces.

+

 Wed Apr  1 19:39:12 EEST 2009 (edwin)

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

  * libclamav/pe.c: cli_parseres_special: check size before attempting

@@ -740,9 +740,9 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

 #ifndef C_WINDOWS

     if(getrlimit(RLIMIT_FSIZE, &rlim) == 0) {

-	if(rlim.rlim_max < (rlim_t) cl_engine_get_num(engine, CL_ENGINE_MAX_FILESIZE, NULL))

+	if(rlim.rlim_cur < (rlim_t) cl_engine_get_num(engine, CL_ENGINE_MAX_FILESIZE, NULL))

 	    logg("^System limit for file size is lower than engine->maxfilesize\n");

-	if(rlim.rlim_max < (rlim_t) cl_engine_get_num(engine, CL_ENGINE_MAX_SCANSIZE, NULL))

+	if(rlim.rlim_cur < (rlim_t) cl_engine_get_num(engine, CL_ENGINE_MAX_SCANSIZE, NULL))

 	    logg("^System limit for file size is lower than engine->maxscansize\n");

     } else {

 	logg("^Cannot obtain resource limits for file size\n");

@@ -775,6 +775,11 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

     else

     	logg("^Limits: Files limit protection disabled.\n");

+#if !defined(C_WINDOWS)

+    if (getrlimit(RLIMIT_CORE, &rlim) == 0) {

+	logg("*Limits: Core-dump limit is %lu.\n", (unsigned long)rlim.rlim_cur);

+    }

+#endif

     if(optget(opts, "ScanArchive")->enabled) {

 	logg("Archive support enabled.\n");

@@ -930,10 +935,30 @@ int recvloop_th(int *socketds, unsigned nsockets, struct cl_engine *engine, unsi

     logg("*Listening daemon: PID: %u\n", (unsigned int) mainpid);

     max_threads = optget(opts, "MaxThreads")->numarg;

-    acceptdata.max_queue = max_queue = optget(opts, "MaxQueue")->numarg;

+    max_queue = optget(opts, "MaxQueue")->numarg;

     acceptdata.commandtimeout = optget(opts, "CommandReadTimeout")->numarg;

     readtimeout = optget(opts, "ReadTimeout")->numarg;

+#if !defined(C_WINDOWS) && defined(RLIMIT_NOFILE)

+    if (getrlimit(RLIMIT_NOFILE, &rlim) == 0) {

+	if (max_queue*4 > rlim.rlim_cur) {

+	    max_queue = rlim.rlim_cur / 4;

+	    logg("^MaxQueue value too high, lowering to: %d\n", max_queue);

+	} else if (max_queue < 2*max_threads) {

+	    /* increase it but only if it doesn't exceed limit otherwise */

+	    int newmax = 2*max_threads;

+	    if (newmax*4 > rlim.rlim_cur)

+		newmax = rlim.rlim_cur/4;

+	    if (max_queue < newmax) {

+		max_queue = newmax;

+		logg("^MaxQueue is lower than twice MaxThreads, increasing to: %d\n", max_queue);

+	    }

+	}

+    }

+#endif

+

+    acceptdata.max_queue = max_queue;

+

     if(optget(opts, "ClamukoScanOnAccess")->enabled)

 #ifdef CLAMUKO

     {

@@ -369,11 +369,6 @@ threadpool_t *thrmgr_new(int max_threads, int idle_timeout, int max_queue, void

 		return NULL;

 	}

-	if (2*max_threads > max_queue) {

-	    logg("!Configuration error: MaxQueue should be at least twice MaxThreads\n");

-	    return NULL;

-	}

-

 	threadpool = (threadpool_t *) malloc(sizeof(threadpool_t));

 	if (!threadpool) {

 		return NULL;