@@ -51,7 +51,7 @@ struct smfiDesc descr = {

     clamfi_connect,	/* connection info filter */

     NULL,		/* SMTP HELO command filter */

     clamfi_envfrom,	/* envelope sender filter */

-    NULL,		/* envelope recipient filter */

+    clamfi_envrcpt,	/* envelope recipient filter */

     clamfi_header,	/* header filter */

     NULL,		/* end of header */

     clamfi_body,	/* body block */

@@ -224,16 +224,10 @@ int main(int argc, char **argv) {

 	return 1;

     }

-    /* FIXME: find a place for these:

-     * maxthreads = cfgopt(copt, "MaxThreads")->numarg;

-     */

-

     if(cfgopt(copt, "AddHeader")->enabled) {

 	char myname[255];

 	if(!gethostname(myname, sizeof(myname))) {

-	    char mydomain[255];

-

 	    myname[sizeof(myname)-1] = '\0';

 	    snprintf(xvirushdr, sizeof(xvirushdr), "clamav-milter %s at %s", get_version(), myname);

 	    xvirushdr[sizeof(xvirushdr)-1] = '\0';

@@ -14,6 +14,7 @@ sfsistat clamfi_eom(SMFICTX *ctx);

 sfsistat clamfi_header(SMFICTX *ctx, char *headerf, char *headerv);

 sfsistat clamfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr);

 sfsistat clamfi_envfrom(SMFICTX *ctx, char **argv);

+sfsistat clamfi_envrcpt(SMFICTX *ctx, char **argv);

 int init_actions(struct cfgstruct *copt);

 #endif

@@ -28,6 +28,7 @@

 #include <arpa/inet.h>

 #include <sys/types.h>

 #include <sys/socket.h>

+#include <sys/time.h>

 #include <sys/un.h>

 #include <netdb.h>

 #include <unistd.h>

@@ -43,8 +44,16 @@

 #define SETGAI(k, v) {(k)->gai = (void *)(v);} while(0)

 #define FREESRV(k) { if((k).gai) freeaddrinfo((k).gai); else if((k).server) free((k).server); } while(0)

-struct CPOOL *cp = NULL;

+#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)

+#define _UNUSED_ __attribute__ ((__unused__))

+#else

+#define _UNUSED_

+#endif

+struct CPOOL *cp = NULL;

+static pthread_cond_t mon_cond = PTHREAD_COND_INITIALIZER;

+static int quitting = 1;

+static pthread_t probe_th;

 static int cpool_addunix(char *path) {

     struct sockaddr_un *srv;

@@ -132,15 +141,22 @@ int addslot(void) {

     cp->entries++;

     return 0;

 }

-    

+

+

+/* Probe strategy:

+- wake up every minute

+- probe alive if last check > 15 min

+- probe dead if (last check > 2 min || no clamd available)

+*/

 void cpool_probe(void) {

     unsigned int i, dead=0;

     struct CP_ENTRY *cpe = cp->pool;

-    time_t lastpoll = time(NULL) - 5*60;

+    time_t now = time(NULL);

     for(i=1; i<=cp->entries; i++) {

-	if(cpe->dead && lastpoll > cpe->last_poll) {

+	if((cpe->dead && (cpe->last_poll < now - 120 || !cp->alive)) || cpe->last_poll < now - 15*60*60) {

+	    cpe->last_poll = time(NULL);

 	    nc_ping_entry(cpe);

 	    logg("*Probe for slot %u returned: %s\n", i, cpe->dead ? "failed" : "success");

 	}

@@ -148,8 +164,29 @@ void cpool_probe(void) {

 	cpe++;

     }

     cp->alive = cp->entries - dead;

+

     if(!cp->alive)

-	logg("^No clamd server appears to be available, trying again in 5 minutes.\n");

+	logg("^No clamd server appears to be available\n");

+}

+

+

+void *cpool_mon(_UNUSED_ void *v) {

+    pthread_mutex_t conv;

+

+    pthread_mutex_init(&conv, NULL);

+    pthread_mutex_lock(&conv);

+

+    while(!quitting) {

+	struct timespec t;

+

+	cpool_probe();

+	t.tv_sec = time(NULL) + 60;

+	t.tv_nsec = 0;

+	pthread_cond_timedwait(&mon_cond, &conv, &t);

+    }

+    pthread_mutex_unlock(&conv);

+    pthread_mutex_destroy(&conv);

+    return NULL;

 }

@@ -196,13 +233,21 @@ void cpool_init(struct cfgstruct *copt) {

 	cpool_free();

 	return;

     }

-    cpool_probe();

-    srand(time(NULL)); /* FIXME: naive ? */

+    quitting = 0;

+    pthread_create(&probe_th, NULL, cpool_mon, NULL);

+    srand(time(NULL));

 }

 void cpool_free(void) {

     unsigned int i;

+

+    if(!quitting) {

+	logg("*Killing the monitor and stopping\n");

+	pthread_cond_signal(&mon_cond);

+	pthread_join(probe_th, NULL);

+    }

+

     if(cp) {

 	if(cp->pool) {

 	    for(i=0; i<cp->entries; i++)

@@ -228,14 +273,12 @@ struct CP_ENTRY *cpool_get_rand(int *s) {

 		cpe = cp->local_cpe;

 	    if((*s = nc_connect_entry(cpe)) == -1) {

 		cpe->dead = 1;

-		cp->alive--; /* FIXME mutex */

 		continue;

 	    }

 	    return cpe;

 	}

     }

-    logg("!No sockets are alive. Probe forced...\n");

-    /* FIXME: yeah, actually do force smthng here */

+    pthread_cond_signal(&mon_cond);

     return NULL;

 }

@@ -13,15 +13,13 @@

 #include "shared/cfgparser.h"

 struct CP_ENTRY {

+    struct sockaddr *server;

+    void *gai;

+    socklen_t socklen;

+    time_t last_poll;

     uint8_t type;

     uint8_t dead;

     uint8_t local;

-    time_t last_poll;

-    struct sockaddr *server;

-    socklen_t socklen;

-#ifdef HAVE_GETADDRINFO

-    void *gai;

-#endif

 };

 struct CPOOL {

@@ -99,7 +99,7 @@ int nc_connect(int s, struct CP_ENTRY *cpe) {

     if (!res) return 0;

     if (errno != EINPROGRESS) {

 	strerror_r(errno, er, sizeof(er));

-	logg("!connect failed: %s\n", er);

+	logg("*connect failed: %s\n", er);

 	close(s);

 	return -1;

     }

@@ -122,12 +122,12 @@ int nc_connect(int s, struct CP_ENTRY *cpe) {

 		tv.tv_usec = 0;

 		continue;

 	    }

-	    logg("!Failed to establish a connection to clamd\n");

+	    logg("*Failed to establish a connection to clamd\n");

 	    close(s);

 	    return -1;

 	}

 	if (getsockopt(s, SOL_SOCKET, SO_ERROR, &s_err, &s_len) || s_err) {

-	    logg("!Failed to establish a connection to clamd\n");

+	    logg("*Failed to establish a connection to clamd\n");

 	    close(s);

 	    return -1;

 	}

@@ -219,49 +219,56 @@ int nc_sendmsg(int s, int fd) {

 }

 char *nc_recv(int s) {

-    char buf[BUFSIZ], *ret=NULL;

-    time_t timeout = time(NULL) + readtimeout;

+    char buf[128], *ret=NULL;

+    time_t now, timeout = time(NULL) + readtimeout;

     struct timeval tv;

     fd_set fds;

     int res;

+    unsigned int len = 0;

-    tv.tv_sec = readtimeout;

-    tv.tv_usec = 0;

-

-    FD_ZERO(&fds);

-    FD_SET(s, &fds);

     while(1) {

+	now = time(NULL);

+	if(now >= timeout) {

+	    logg("!Timed out while reading clamd reply\n");

+	    close(s);

+	    return NULL;

+	}

+	tv.tv_sec = timeout - now;

+	tv.tv_usec = 0;

+

+	FD_ZERO(&fds);

+	FD_SET(s, &fds);

+

 	res = select(s+1, &fds, NULL, NULL, &tv);

 	if(res<1) {

-	    time_t now;

+	    if (res != -1 || errno != EINTR)

+		timeout = 0;

+	    continue;

+	}

-	    if (res == -1 && errno == EINTR && ((now = time(NULL)) < timeout)) {

-		tv.tv_sec = timeout - now;

-		tv.tv_usec = 0;

-		continue;

-	    }

-	    logg("!Failed to read clamd reply\n");

+	res = recv(s, &buf[len], sizeof(buf) - len, 0);

+	if(res==-1) {

+	    char er[256];

+	    strerror_r(errno, er, sizeof(er));

+	    logg("!recv failed after successful select: %s\n", er);

+	    close(s);

+	    return NULL;

+	}

+	len += res;

+	if(len && buf[len-1] == '\n') break;

+	if(len >= sizeof(buf)) {

+	    logg("!Overlong reply from clamd\n");

 	    close(s);

 	    return NULL;

 	}

-	break;

-    }

-    /* FIXME: check for EOL@EObuf ? */

-    res = recv(s, buf, sizeof(buf), 0);

-    if (res==-1) {

-	char er[256];

-	strerror_r(errno, er, sizeof(er));

-	logg("!recv failed after successful select: %s\n", er);

-	close(s);

-	return NULL;

     }

-    if(!(ret = (char *)malloc(res+1))) {

-	logg("!malloc(%d) failed\n", res+1);

+    if(!(ret = (char *)malloc(len+1))) {

+	logg("!malloc(%d) failed\n", len+1);

 	close(s);

 	return NULL;

     }

-    memcpy(ret, buf, res);

-    ret[res]='\0';

+    memcpy(ret, buf, len);

+    ret[len]='\0';

     return ret;

 }

@@ -450,7 +457,7 @@ int islocalnet_name(char *name) {

     if(!lnet) return 0;

     if(resolve(name, &family, host)) {

-	logg("^Cannot resolv %s\n", name);

+	logg("*Cannot resolv %s\n", name);

 	return 0;

     }

     return islocalnet(family, host);

@@ -481,7 +488,6 @@ int islocalnet_sock(struct sockaddr *sa) {

 	    }

 	}

     } else return 0;

-

     return islocalnet(family, host);

 }

@@ -3,5 +3,5 @@

 int whitelist_init(const char *fname);

 void whitelist_free(void);

-

+int whitelisted(const char *addr, int from);

 #endif