@@ -1,3 +1,7 @@

+Tue Feb 17 17:11:17 EET 2009 (edwin)

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

+ * clamd/clamd.c, shared/optparser.c, shared/output.h: sendtimeout

+

 Tue Feb 17 17:08:18 EET 2009 (edwin)

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

  * clamd/others.c, clamd/others.h, clamd/scanner.c,

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

     logok = optget(opts, "LogClean")->enabled;

     logg_size = optget(opts, "LogFileMaxSize")->numarg;

     logg_verbose = mprintf_verbose = optget(opts, "LogVerbose")->enabled;

+    mprintf_send_timeout = optget(opts, "SendBufTimeout")->numarg;

     do { /* logger initialized */

@@ -189,6 +189,8 @@ const struct clam_option clam_options[] = {

     { "CommandReadTimeout", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 5, NULL, 0, OPT_CLAMD, "This option specifies the time (in seconds) after which clamd should\ntimeout if a client doesn't provide any initial command after connecting.", "5" },

+    { "SendBufTimeout", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 200, NULL, 0, OPT_CLAMD, "This option specifies how long to wait (in miliseconds) if the send buffer is full. Keep this value to prevent clamd hanging\n", "200"},

+

     { "ReadTimeout", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 120, NULL, 0, OPT_MILTER, "Waiting for data from clamd will timeout after this time (seconds).\nValue of 0 disables the timeout.", "300" },

     { "MaxQueue", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 100, NULL, 0, OPT_CLAMD, "Maximum number of queued items (including those being processed)\nWARNING: you shouldn't increase this beyond 512, since you may run out of File Descriptors (usual max is 1024)\n", "200" },

@@ -55,6 +55,6 @@ void mprintf(const char *str, ...) __attribute__((format(printf, 1, 2)));

 void mprintf(const char *str, ...);

 #endif

-extern short int mprintf_disabled, mprintf_verbose, mprintf_quiet, mprintf_nowarn, mprintf_stdout;

+extern short int mprintf_disabled, mprintf_verbose, mprintf_quiet, mprintf_nowarn, mprintf_stdout, mprintf_send_timeout;

 #endif