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

+Thu Nov 25 18:38:06 CET 2004 (tk)

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

+  * clamd: new directives StreamMinPort and StreamMaxPort (allow port range

+	   specification for stream mode). Patch by Alexander Marx

+	   <mad-ml*madness.at>)

+

 Tue Nov 23 23:23:45 CET 2004 (tk)

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

   * clamscan: --move: preserve original access and modification times

@@ -264,9 +264,9 @@ int scan(const char *filename, unsigned long int *scanned, const struct cl_node

 int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, const struct cfgstruct *copt)

 {

 	int ret, portscan = CL_DEFAULT_MAXPORTSCAN, sockfd, port, acceptd;

-	int tmpd, bread, retval, timeout, btread;

+	int tmpd, bread, retval, timeout, btread, min_port, max_port;

 	long int size = 0, maxsize = 0;

-	short bound = 0;

+	short bound = 0, rnd_port_first = 1;

 	const char *virname;

 	char buff[FILEBUFF];

 	struct sockaddr_in server;

@@ -275,9 +275,35 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	FILE *tmp = NULL;

+    /* get min port */

+    if((cpt = cfgopt(copt, "StreamMinPort"))) {

+	if(cpt->numarg < 1024 || cpt->numarg > 65535)

+	    min_port = 1024;

+	else 

+	    min_port = cpt->numarg;

+    } else 

+	min_port = 1024;

+

+    /* get max port */

+    if((cpt = cfgopt(copt, "StreamMaxPort"))) {

+	if(cpt->numarg < min_port || cpt->numarg > 65535)

+	    max_port = 65535;

+	else

+	    max_port = cpt->numarg;

+    } else

+	max_port = 65535;

+

+    /* bind to a free port */

     while(!bound && portscan--) {

-	if((port = cli_rndnum(60000)) < 1024)

-	    port += 2139;

+	if(rnd_port_first) {

+	    /* try a random port first */

+	    port = min_port + cli_rndnum(max_port - min_port + 1);

+	    rnd_port_first = 0;

+	} else {

+	    /* try the neighbor ports */

+	    if(--port < min_port)

+		port=max_port;

+	}

 	memset((char *) &server, 0, sizeof(server));

 	server.sin_family = AF_INET;

@@ -303,7 +329,6 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_node *root

 	    close(sockfd);

 	else

 	    bound = 1;

-

     }

     if((cpt = cfgopt(copt, "ReadTimeout")))

@@ -1,5 +1,5 @@

 .\" Manual page created by Tomasz Kojm, 20021001.

-.TH "clamd.conf" "5" "September 27, 2004" "Tomasz Kojm" "Clam AntiVirus"

+.TH "clamd.conf" "5" "November 25, 2004" "Tomasz Kojm" "Clam AntiVirus"

 .SH "NAME"

 .LP 

 \fBclamd.conf\fR \- Configuration file for Clam AntiVirus Daemon

@@ -160,10 +160,20 @@ Default: disabled

 Enable debug messages from libclamav.

 .TP 

 \fBStreamMaxLength SIZE\fR

-Close the connection when this limit is exceeded.

+Clamd uses FTP\-like protocol to receive data from remote clients. If you are using clamav\-milter to balance load between remote clamd daemons on firewall servers you may need to tune the Stream* options. This option allows you to specify the maximal limit for data transfered to remote daemon when scanning a single file.

 .br 

 Default: 10M

 .TP 

+\fBStreamMinPort NUMBER\fR

+Limit data port range.

+.br 

+Default: 1024

+.TP 

+\fBStreamMaxPort NUMBER\fR

+Limit data port range.

+.br 

+Default: 65535

+.TP 

 \fBDisableDefaultScanOptions\fR

 By default clamd uses scan options recommended by libclamav. This option disables recommended options and allows you to enable selected options. DO NOT ENABLE IT unless you know what you are doing.

 .br 

@@ -90,10 +90,20 @@ FixStaleSocket

 # Default: 15

 #MaxConnectionQueueLength 30

-# Close the connection if this limit is exceeded.

+# Clamd uses FTP-like protocol to receive data from remote clients.

+# If you are using clamav-milter to balance load between remote clamd daemons

+# on firewall servers you may need to tune the options below.

+

+# Close the connection when the data size limit is exceeded.

 # Default: 10M

 #StreamMaxLength 20M

+# Limit port range.

+# Default: 1024

+#StreamMinPort 30000

+# Default: 65535

+#StreamMaxPort 32000

+

 # Maximal number of threads running at the same time.

 # Default: 10

 #MaxThreads 20

@@ -84,6 +84,8 @@ struct cfgstruct *parsecfg(const char *cfgfile, int messages)

 	    {"LocalSocket", OPT_STR},

 	    {"MaxConnectionQueueLength", OPT_NUM},

 	    {"StreamMaxLength", OPT_COMPSIZE},

+	    {"StreamMinPort", OPT_NUM},

+	    {"StreamMaxPort", OPT_NUM},

 	    {"MaxThreads", OPT_NUM},

 	    {"ReadTimeout", OPT_NUM},

 	    {"IdleTimeout", OPT_NUM},