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

+Fri Nov  5 15:32:22 CET 2010 (tk)

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

+ * freshclam: get detection stats directly from clamd (bb#2312)

+

 Thu Nov  4 21:12:53 EET 2010 (edwin)

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

  * libclamav/cache.c,c++/bytecode2llvm.cpp}: make cl_load thread safe (bb #2333).

@@ -31,6 +31,8 @@ clamdscan_SOURCES = \

     $(top_srcdir)/shared/getopt.h \

     $(top_srcdir)/shared/actions.c \

     $(top_srcdir)/shared/actions.h \

+    $(top_srcdir)/shared/clamdcom.c \

+    $(top_srcdir)/shared/clamdcom.h \

     clamdscan.c \

     proto.c \

     proto.h \

@@ -81,13 +81,14 @@ am__clamdscan_SOURCES_DIST = $(top_srcdir)/shared/output.c \

 	$(top_srcdir)/shared/optparser.h $(top_srcdir)/shared/misc.c \

 	$(top_srcdir)/shared/misc.h $(top_srcdir)/shared/getopt.c \

 	$(top_srcdir)/shared/getopt.h $(top_srcdir)/shared/actions.c \

-	$(top_srcdir)/shared/actions.h clamdscan.c proto.c proto.h \

+	$(top_srcdir)/shared/actions.h $(top_srcdir)/shared/clamdcom.c \

+	$(top_srcdir)/shared/clamdcom.h clamdscan.c proto.c proto.h \

 	client.c client.h

 @BUILD_CLAMD_TRUE@am_clamdscan_OBJECTS = output.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	optparser.$(OBJEXT) misc.$(OBJEXT) \

 @BUILD_CLAMD_TRUE@	getopt.$(OBJEXT) actions.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	clamdscan.$(OBJEXT) proto.$(OBJEXT) \

-@BUILD_CLAMD_TRUE@	client.$(OBJEXT)

+@BUILD_CLAMD_TRUE@	clamdcom.$(OBJEXT) clamdscan.$(OBJEXT) \

+@BUILD_CLAMD_TRUE@	proto.$(OBJEXT) client.$(OBJEXT)

 clamdscan_OBJECTS = $(am_clamdscan_OBJECTS)

 clamdscan_LDADD = $(LDADD)

 AM_V_lt = $(am__v_lt_$(V))

@@ -295,6 +296,8 @@ top_srcdir = @top_srcdir@

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/getopt.h \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/actions.c \

 @BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/actions.h \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/clamdcom.c \

+@BUILD_CLAMD_TRUE@    $(top_srcdir)/shared/clamdcom.h \

 @BUILD_CLAMD_TRUE@    clamdscan.c \

 @BUILD_CLAMD_TRUE@    proto.c \

 @BUILD_CLAMD_TRUE@    proto.h \

@@ -408,6 +411,7 @@ distclean-compile:

 	-rm -f *.tab.c

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actions.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamdcom.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamdscan.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@

@@ -520,6 +524,22 @@ actions.obj: $(top_srcdir)/shared/actions.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o actions.obj `if test -f '$(top_srcdir)/shared/actions.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/actions.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/actions.c'; fi`

+clamdcom.o: $(top_srcdir)/shared/clamdcom.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clamdcom.o -MD -MP -MF $(DEPDIR)/clamdcom.Tpo -c -o clamdcom.o `test -f '$(top_srcdir)/shared/clamdcom.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/clamdcom.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po

+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clamdcom.o `test -f '$(top_srcdir)/shared/clamdcom.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/clamdcom.c

+

+clamdcom.obj: $(top_srcdir)/shared/clamdcom.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clamdcom.obj -MD -MP -MF $(DEPDIR)/clamdcom.Tpo -c -o clamdcom.obj `if test -f '$(top_srcdir)/shared/clamdcom.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/clamdcom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/clamdcom.c'; fi`

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po

+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clamdcom.obj `if test -f '$(top_srcdir)/shared/clamdcom.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/clamdcom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/clamdcom.c'; fi`

+

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -56,6 +56,8 @@

 #include "shared/output.h"

 #include "shared/misc.h"

 #include "shared/actions.h"

+#include "shared/clamdcom.h"

+

 #include "libclamav/str.h"

 #include "libclamav/others.h"

@@ -47,6 +47,7 @@

 #include "shared/actions.h"

 #include "shared/output.h"

 #include "shared/misc.h"

+#include "shared/clamdcom.h"

 #include "proto.h"

 #include "client.h"

@@ -77,89 +78,6 @@ int dconnect() {

     return sockd;

 }

-/* Sends bytes over a socket

- * Returns 0 on success */

-int sendln(int sockd, const char *line, unsigned int len) {

-    while(len) {

-	int sent = send(sockd, line, len, 0);

-	if(sent <= 0) {

-	    if(sent && errno == EINTR) continue;

-	    logg("!Can't send to clamd: %s\n", strerror(errno));

-	    return 1;

-	}

-	line += sent;

-	len -= sent;

-    }

-    return 0;

-}

-

-/* Inits a RECVLN struct before it can be used in recvln() - see below */

-void recvlninit(struct RCVLN *s, int sockd) {

-    s->sockd = sockd;

-    s->bol = s->cur = s->buf;

-    s->r = 0;

-}

-

-/* Receives a full (terminated with \0) line from a socket

- * Sets rbol to the begin of the received line, and optionally 

- * reol to the ond of line.

- * Should be called repeatedly untill all input is conumed

- * Returns 

- * - the lenght of the line (a positive number) on success

- * - 0 if the connection is closed

- * - -1 on error

- */

-int recvln(struct RCVLN *s, char **rbol, char **reol) {

-    char *eol;

-

-    while(1) {

-	if(!s->r) {

-	    s->r = recv(s->sockd, s->cur, sizeof(s->buf) - (s->cur - s->buf), 0);

-	    if(s->r<=0) {

-		if(s->r && errno == EINTR) {

-		    s->r = 0;

-		    continue;

-		}

-		if(s->r || s->cur!=s->buf) {

-		    *s->cur = '\0';

-		    if(strcmp(s->buf, "UNKNOWN COMMAND\n"))

-			logg("!Communication error\n");

-		    else

-			logg("!Command rejected by clamd (wrong clamd version?)\n");

-		    return -1;

-		}

-	        return 0;

-	    }

-	}

-	if((eol = memchr(s->cur, 0, s->r))) {

-	    int ret = 0;

-	    eol++;

-	    s->r -= eol - s->cur;

-	    *rbol = s->bol;

-	    if(reol) *reol = eol;

-	    ret = eol - s->bol;

-	    if(s->r)

-		s->bol = s->cur = eol;

-	    else

-		s->bol = s->cur = s->buf;

-	    return ret;

-	}

-	s->r += s->cur - s->bol;

-	if(!eol && s->r==sizeof(s->buf)) {

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

-	    return -1;

-	}

-	if(!eol) {

-	    if(s->buf != s->bol) { /* old memmove sux */

-		memmove(s->buf, s->bol, s->r);

-		s->bol = s->buf;

-	    }

-	    s->cur = &s->bol[s->r];

-	    s->r = 0;

-	}

-    }

-}

-

 /* Issues an INSTREAM command to clamd and streams the given file

  * Returns >0 on success, 0 soft fail, -1 hard fail */

 static int send_stream(int sockd, const char *filename) {

@@ -22,18 +22,7 @@

 #define PROTO_H

 #include "shared/misc.h"

-struct RCVLN {

-    char buf[PATH_MAX+1024]; /* FIXME must match that in clamd - bb1349 */

-    int sockd;

-    int r;

-    char *cur;

-    char *bol;

-};

-

 int dconnect(void);

-int sendln(int sockd, const char *line, unsigned int len);

-void recvlninit(struct RCVLN *s, int sockd);

-int recvln(struct RCVLN *s, char **rbol, char **reol);

 int serial_client_scan(char *file, int scantype, int *infected, int *err, int maxlevel, int flags);

 int parallel_client_scan(char *file, int scantype, int *infected, int *err, int maxlevel, int flags);

 int dsresult(int sockd, int scantype, const char *filename, int *printok, int *errors);

@@ -67,7 +67,7 @@ Enable verbose logging.

 Default: no

 .TP 

 \fBExtendedDetectionInfo BOOL\fR

-Provide additional information about the infected file, such as its size and hash, together with the virus name. It's recommended to enable this option along with SubmitDetectionStats in freshclam.conf.

+Log additional information about the infected file, such as its size and hash, together with the virus name.

 .br 

 Default: no

 .TP 

@@ -160,7 +160,7 @@ Timeout in seconds when reading from database server.

 Default: 30

 .TP

 \fBSubmitDetectionStats STRING\fR

-When enabled freshclam will submit statistics to the ClamAV Project about the latest virus detections in your environment. The ClamAV maintainers will then use this data to determine what types of malware are the most detected in the field and in what geographic area they are. This feature requires LogTime and LogFile to be enabled in clamd.conf, it's also recommended to turn on ExtendedDetectionInfo. The path for clamd.conf file must be provided.

+When enabled freshclam will submit statistics to the ClamAV Project about the latest virus detections in your environment. The ClamAV maintainers will then use this data to determine what types of malware are the most detected in the field and in what geographic area they are. Freshclam will connect to clamd in order to get the recent statistics. The path for clamd.conf file must be provided.

 .br

 Default: disabled

 .TP

@@ -51,9 +51,8 @@ Example

 # Default: no

 #LogVerbose yes

-# Provide additional information about the infected file, such as its

-# size and hash, together with the virus name. It's recommended to enable

-# this option along with SubmitDetectionStats in freshclam.conf.

+# Log additional information about the infected file, such as its

+# size and hash, together with the virus name.

 #ExtendedDetectionInfo yes

 # This option allows you to save a process identifier of the listening

@@ -158,8 +158,7 @@ DatabaseMirror database.clamav.net

 # the latest virus detections in your environment. The ClamAV maintainers

 # will then use this data to determine what types of malware are the most

 # detected in the field and in what geographic area they are.

-# This feature requires LogTime and LogFile to be enabled in clamd.conf,

-# it's also recommended to turn on ExtendedDetectionInfo.

+# Freshclam will connect to clamd in order to get recent statistics.

 # Default: no

 #SubmitDetectionStats /path/to/clamd.conf

@@ -32,6 +32,8 @@ freshclam_SOURCES = \

     $(top_srcdir)/shared/cdiff.h \

     $(top_srcdir)/shared/tar.c \

     $(top_srcdir)/shared/tar.h \

+    $(top_srcdir)/shared/clamdcom.c \

+    $(top_srcdir)/shared/clamdcom.h \

     freshclam.c \

     manager.c \

     manager.h \

@@ -79,9 +79,9 @@ am__installdirs = "$(DESTDIR)$(bindir)"

 PROGRAMS = $(bin_PROGRAMS)

 am_freshclam_OBJECTS = output.$(OBJEXT) optparser.$(OBJEXT) \

 	getopt.$(OBJEXT) misc.$(OBJEXT) cdiff.$(OBJEXT) tar.$(OBJEXT) \

-	freshclam.$(OBJEXT) manager.$(OBJEXT) notify.$(OBJEXT) \

-	dns.$(OBJEXT) execute.$(OBJEXT) nonblock.$(OBJEXT) \

-	mirman.$(OBJEXT)

+	clamdcom.$(OBJEXT) freshclam.$(OBJEXT) manager.$(OBJEXT) \

+	notify.$(OBJEXT) dns.$(OBJEXT) execute.$(OBJEXT) \

+	nonblock.$(OBJEXT) mirman.$(OBJEXT)

 freshclam_OBJECTS = $(am_freshclam_OBJECTS)

 freshclam_LDADD = $(LDADD)

 AM_V_lt = $(am__v_lt_$(V))

@@ -291,6 +291,8 @@ freshclam_SOURCES = \

     $(top_srcdir)/shared/cdiff.h \

     $(top_srcdir)/shared/tar.c \

     $(top_srcdir)/shared/tar.h \

+    $(top_srcdir)/shared/clamdcom.c \

+    $(top_srcdir)/shared/clamdcom.h \

     freshclam.c \

     manager.c \

     manager.h \

@@ -412,6 +414,7 @@ distclean-compile:

 	-rm -f *.tab.c

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdiff.Po@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamdcom.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/execute.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freshclam.Po@am__quote@

@@ -545,6 +548,22 @@ tar.obj: $(top_srcdir)/shared/tar.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tar.obj `if test -f '$(top_srcdir)/shared/tar.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/tar.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/tar.c'; fi`

+clamdcom.o: $(top_srcdir)/shared/clamdcom.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clamdcom.o -MD -MP -MF $(DEPDIR)/clamdcom.Tpo -c -o clamdcom.o `test -f '$(top_srcdir)/shared/clamdcom.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/clamdcom.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po

+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.o' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clamdcom.o `test -f '$(top_srcdir)/shared/clamdcom.c' || echo '$(srcdir)/'`$(top_srcdir)/shared/clamdcom.c

+

+clamdcom.obj: $(top_srcdir)/shared/clamdcom.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clamdcom.obj -MD -MP -MF $(DEPDIR)/clamdcom.Tpo -c -o clamdcom.obj `if test -f '$(top_srcdir)/shared/clamdcom.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/clamdcom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/clamdcom.c'; fi`

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/clamdcom.Tpo $(DEPDIR)/clamdcom.Po

+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/shared/clamdcom.c' object='clamdcom.obj' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clamdcom.obj `if test -f '$(top_srcdir)/shared/clamdcom.c'; then $(CYGPATH_W) '$(top_srcdir)/shared/clamdcom.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/shared/clamdcom.c'; fi`

+

 mostlyclean-libtool:

 	-rm -f *.lo

@@ -75,6 +75,7 @@

 #include "shared/misc.h"

 #include "shared/cdiff.h"

 #include "shared/tar.h"

+#include "shared/clamdcom.h"

 #include "libclamav/clamav.h"

 #include "libclamav/others.h"

@@ -429,6 +430,7 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip

     return -2;

 }

+/*

 static const char *readblineraw(int fd, char *buf, int bufsize, int filesize, int *bread)

 {

 	char *pt;

@@ -489,6 +491,7 @@ static const char *readbline(int fd, char *buf, int bufsize, int filesize, int *

     return line;

 }

+*/

 static unsigned int fmt_base64(char *dest, const char *src, unsigned int len)

 {

@@ -559,25 +562,18 @@ static char *proxyauth(const char *user, const char *pass)

     return auth;

 }

-/*

- * TODO:

- * - strptime() is most likely not portable enough

- */

 int submitstats(const char *clamdcfg, const struct optstruct *opts)

 {

-	int fd, sd, bread, lread = 0, cnt, ret;

+	int sd, clamsockd, bread, cnt, ret;

 	char post[SUBMIT_MIN_ENTRIES * 256 + 512];

 	char query[SUBMIT_MIN_ENTRIES * 256];

-	char buff[512], statsdat[512], newstatsdat[512], uastr[128];

-	char logfile[256], fbuff[FILEBUFF];

-	char *pt, *pt2, *auth = NULL;

-	const char *line, *country = NULL, *user, *proxy = NULL, *hostid = NULL;

-	struct optstruct *clamdopt;

+	char uastr[128], *line;

+	char *pt, *auth = NULL;

+	const char *country = NULL, *user, *proxy = NULL, *hostid = NULL;

 	const struct optstruct *opt;

-	struct stat sb;

-	struct tm tms;

-	time_t epoch;

 	unsigned int qcnt, entries, submitted = 0, permfail = 0, port = 0;

+        struct RCVLN rcv;

+	const char *tokens[5];

     if((opt = optget(opts, "DetectionStatsCountry"))->enabled) {

@@ -596,67 +592,6 @@ int submitstats(const char *clamdcfg, const struct optstruct *opts)

 	hostid = opt->strarg;

     }

-    if(!(clamdopt = optparse(clamdcfg, 0, NULL, 1, OPT_CLAMD, 0, NULL))) {

-	logg("!SubmitDetectionStats: Can't open or parse configuration file %s\n", clamdcfg);

-	return 56;

-    }

-

-    if(!(opt = optget(clamdopt, "LogFile"))->enabled) {

-	logg("!SubmitDetectionStats: LogFile needs to be enabled in %s\n", clamdcfg);

-	logg("SubmitDetectionStats: Please consider enabling ExtendedDetectionInfo\n");

-	optfree(clamdopt);

-	return 56;

-    }

-    strncpy(logfile, opt->strarg, sizeof(logfile));

-    logfile[sizeof(logfile) - 1] = 0;

-

-    if(!optget(clamdopt, "LogTime")->enabled) {

-	logg("!SubmitDetectionStats: LogTime needs to be enabled in %s\n", clamdcfg);

-	optfree(clamdopt);

-	return 56;

-    }

-    optfree(clamdopt);

-

-    if((fd = open("stats.dat", O_RDONLY|O_BINARY)) != -1) {

-	if((bread = read(fd, statsdat, sizeof(statsdat) - 1)) == -1) {

-	    logg("^SubmitDetectionStats: Can't read stats.dat\n");

-	    bread = 0;

-	}

-	statsdat[bread] = 0;

-	close(fd);

-    } else {

-	*statsdat = 0;

-    }

-

-    if((fd = open(logfile, O_RDONLY|O_BINARY)) == -1) {

-	logg("!SubmitDetectionStats: Can't open %s for reading\n", logfile);

-	return 56;

-    }

-

-    if(fstat(fd, &sb) == -1) {

-	logg("!SubmitDetectionStats: fstat() failed\n");

-	close(fd);

-	return 56;

-    }

-

-    while((line = readbline(fd, fbuff, FILEBUFF, sb.st_size, &lread)))

-	if(strlen(line) >= 32 && !strcmp(&line[strlen(line) - 6], " FOUND"))

-	    break;

-

-    if(!line) {

-	logg("SubmitDetectionStats: No detection records found\n");

-	close(fd);

-	return 1;

-    }

-

-    if(*statsdat && !strcmp(line, statsdat)) {

-	logg("SubmitDetectionStats: No new detection records found\n");

-	close(fd);

-	return 1;

-    } else {

-	strncpy(newstatsdat, line, sizeof(newstatsdat));

-    }

-

     if((opt = optget(opts, "HTTPUserAgent"))->enabled)

         strncpy(uastr, opt->strarg, sizeof(uastr));

     else

@@ -672,14 +607,11 @@ int submitstats(const char *clamdcfg, const struct optstruct *opts)

 	    user = opt->strarg;

 	    if(!(opt = optget(opts, "HTTPProxyPassword"))->enabled) {

 		logg("!SubmitDetectionStats: HTTPProxyUsername requires HTTPProxyPassword\n");

-		close(fd);

 		return 56;

 	    }

 	    auth = proxyauth(user, opt->strarg);

-	    if(!auth) {

-		close(fd);

+	    if(!auth)

 		return 56;

-	    }

 	}

 	if((opt = optget(opts, "HTTPProxyPort"))->enabled)

@@ -688,50 +620,27 @@ int submitstats(const char *clamdcfg, const struct optstruct *opts)

 	logg("*Connecting via %s\n", proxy);

     }

+    if((clamsockd = clamd_connect(clamdcfg, "SubmitDetectionStats")) < 0)

+	return 52;

+

+    recvlninit(&rcv, clamsockd);

+    if(sendln(clamsockd, "zDETSTATS", 10)) {

+        closesocket(clamsockd);

+	return 52;

+    }

+

     ret = 0;

     memset(query, 0, sizeof(query));

     qcnt = 0;

     entries = 0;

-    do {

-	if(strlen(line) < 32 || strcmp(&line[strlen(line) - 6], " FOUND"))

-	    continue;

-

-	if(*statsdat && !strcmp(line, statsdat))

-	    break;

-

-	strncpy(buff, line, sizeof(buff));

-	buff[sizeof(buff) - 1] = 0;

-	if(!(pt = strstr(buff, " -> "))) {

-	    logg("*SubmitDetectionStats: Skipping detection entry logged without time\b");

-	    continue;

-	}

-	*pt = 0;

-	pt += 4;

-

-	tms.tm_isdst = -1;

-	if(!strptime(buff, "%a %b  %d %H:%M:%S %Y", &tms) || (epoch = mktime(&tms)) == -1) {

-	    logg("!SubmitDetectionStats: Failed to convert date string\n");

-	    ret = 1;

-	    break;

-	}

-

-	pt2 = &pt[strlen(pt) - 6];

-	*pt2 = 0;

-

-	if(!(pt2 = strrchr(pt, ' ')) || pt2[-1] != ':') {

-	    logg("!SubmitDetectionStats: Incorrect format of the log file (1)\n");

-	    ret = 1;

+    while(recvln(&rcv, &line, NULL) > 0) {

+        if(cli_strtokenize(line, ':', 5, tokens) != 5) {

+	    logg("!SubmitDetectionStats: Invalid data format\n");

+	    ret = 52;

 	    break;

 	}

-	pt2[-1] = 0;

-	pt2++;

-	if((pt = strrchr(pt, *PATHSEP)))

-	    *pt++ = 0;

-	if(!pt)

-	    pt = (char*) "NOFNAME";

-

-	qcnt += snprintf(&query[qcnt], sizeof(query) - qcnt, "ts[]=%u&fname[]=%s&virus[]=%s&", (unsigned int) epoch, pt, pt2);

+	qcnt += snprintf(&query[qcnt], sizeof(query) - qcnt, "ts[]=%s&fname[]=%s&fsize[]=%s&md5[]=%s&virus[]=%s&", tokens[0], tokens[4], tokens[2], tokens[1], tokens[3]);

 	entries++;

 	if(entries == SUBMIT_MIN_ENTRIES) {

@@ -741,7 +650,6 @@ int submitstats(const char *clamdcfg, const struct optstruct *opts)

 		ret = 52;

 		break;

 	    }

-

 	    query[sizeof(query) - 1] = 0;

 	    if(mdprintf(sd,

 		"POST http://stats.clamav.net/submit.php HTTP/1.0\r\n"

@@ -812,30 +720,23 @@ int submitstats(const char *clamdcfg, const struct optstruct *opts)

 	    break;

 	}

-

-    } while((line = readbline(fd, fbuff, FILEBUFF, sb.st_size, &lread)));

-

-    close(fd);

+    }

+    closesocket(clamsockd);

     if(auth)

 	free(auth);

-    if(submitted || permfail) {

-	if((fd = open("stats.dat", O_WRONLY | O_BINARY | O_CREAT | O_TRUNC, 0600)) == -1) {

-	    logg("^SubmitDetectionStats: Can't open stats.dat for writing\n");

-	} else {

-	    if((bread = write(fd, newstatsdat, sizeof(newstatsdat))) != sizeof(newstatsdat))

-		logg("^SubmitDetectionStats: Can't write to stats.dat\n");

-	    close(fd);

-	}

-    }

-

     if(ret == 0) {

-	if(!submitted)

+	if(!submitted) {

 	    logg("SubmitDetectionStats: Not enough recent data for submission\n");

-	else

+	} else {

 	    logg("SubmitDetectionStats: Submitted %u records\n", submitted);

+	    if((clamsockd = clamd_connect(clamdcfg, "SubmitDetectionStats")) != -1) {

+		sendln(clamsockd, "DETSTATSCLEAR", 14);

+		recv(clamsockd, query, sizeof(query), 0);

+		closesocket(clamsockd);

+	    }

+	}

     }

-

     return ret;

 }

@@ -1970,7 +1871,7 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

 static int updatecustomdb(const char *url, int *signo, const struct optstruct *opts, char *localip, int logerr)

 {

 	const struct optstruct *opt;

-	unsigned int port = 0, newsigs = 0, sigs = 0;

+	unsigned int port = 0, sigs = 0;

 	int ret;

 	char *pt, *host, urlcpy[256], *newfile = NULL, mtime[36], *newfile2;

 	const char *proxy = NULL, *user = NULL, *pass = NULL, *uas = NULL, *rpath, *dbname;

@@ -39,11 +39,12 @@

 #include "shared/optparser.h"

 #include "shared/output.h"

+#include "shared/clamdcom.h"

+

 #include "notify.h"

-int notify(const char *cfgfile)

+int clamd_connect(const char *cfgfile, const char *option)

 {

-	char buff[20];

 #ifndef	_WIN32

 	struct sockaddr_un server;

 #endif

@@ -63,8 +64,8 @@ int notify(const char *cfgfile)

     if((opts = optparse(cfgfile, 0, NULL, 1, OPT_CLAMD, 0, NULL)) == NULL) {

-	logg("^Clamd was NOT notified: Can't find or parse configuration file %s\n", cfgfile);

-	return 1;

+	logg("!%s: Can't find or parse configuration file %s\n", option, cfgfile);

+	return -11;

     }

 #ifndef	_WIN32

@@ -78,7 +79,7 @@ int notify(const char *cfgfile)

 	    logg("^Clamd was NOT notified: Can't create socket endpoint for %s\n", opt->strarg);

 	    perror("socket()");

 	    optfree(opts);

-	    return 1;

+	    return -1;

 	}

 	if(connect(sockd, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) < 0) {

@@ -86,7 +87,7 @@ int notify(const char *cfgfile)

 	    logg("^Clamd was NOT notified: Can't connect to clamd through %s\n", opt->strarg);

 	    perror("connect()");

 	    optfree(opts);

-	    return 1;

+	    return -11;

 	}

     } else

@@ -113,36 +114,36 @@ int notify(const char *cfgfile)

 	ret = getaddrinfo(addr, port, &hints, &res);

 	if(ret) {

-	    logg("^Clamd was NOT notified: Can't resolve hostname %s (%s)\n", addr ? addr : "", (ret == EAI_SYSTEM) ? strerror(errno) : gai_strerror(ret));

+	    logg("!%s: Can't resolve hostname %s (%s)\n", option, addr ? addr : "", (ret == EAI_SYSTEM) ? strerror(errno) : gai_strerror(ret));

 	    optfree(opts);

-	    return 1;

+	    return -1;

 	}

 	if((sockd = socket(res->ai_family, SOCK_STREAM, 0)) < 0) {

 	    perror("socket()");

-	    logg("^Clamd was NOT notified: Can't create TCP socket\n");

+	    logg("!%s: Can't create TCP socket\n", option);

 	    optfree(opts);

 	    freeaddrinfo(res);

-	    return 1;

+	    return -1;

 	}

 	if(connect(sockd, res->ai_addr, res->ai_addrlen) == -1) {

 	    perror("connect()");

 	    closesocket(sockd);

-	    logg("^Clamd was NOT notified: Can't connect to clamd on %s:%s\n", addr ? addr : "localhost", port);

+	    logg("!%s: Can't connect to clamd on %s:%s\n", option, addr ? addr : "localhost", port);

 	    optfree(opts);

 	    freeaddrinfo(res);

-	    return 1;

+	    return -1;

 	}

 	freeaddrinfo(res);

 #else /* IPv4 */

 	if((sockd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

-	    logg("^Clamd was NOT notified: Can't create TCP socket\n");

+	    logg("!%s: Can't create TCP socket\n", option);

 	    perror("socket()");

 	    optfree(opts);

-	    return 1;

+	    return -1;

 	}

 	server2.sin_family = AF_INET;

@@ -154,7 +155,7 @@ int notify(const char *cfgfile)

 		logg("^Clamd was NOT notified: Can't resolve hostname '%s'\n", opt->strarg);

 		optfree(opts);

 		closesocket(sockd);

-		return 1;

+		return -1;

 	    }

 	    server2.sin_addr = *(struct in_addr *) he->h_addr_list[0];

 	} else

@@ -167,39 +168,48 @@ int notify(const char *cfgfile)

 		    inet_ntoa(server2.sin_addr), ntohs(server2.sin_port));

 	    perror("connect()");

 	    optfree(opts);

-	    return 1;

+	    return -1;

 	}

 #endif

     } else {

-	logg("^Clamd was NOT notified: No socket specified in %s\n", cfgfile);

+	logg("!%s: No communication socket specified in %s\n", option, cfgfile);

 	optfree(opts);

 	return 1;

     }

-    if(send(sockd, "RELOAD", 6, 0) < 0) {

-	logg("^Clamd was NOT notified: Could not write to %s socket\n", socktype);

-	perror("write()");

+    optfree(opts);

+    return sockd;

+}

+

+int notify(const char *cfgfile)

+{

+	char buff[20];

+	int sockd, bread;

+	const char *socktype;

+

+    if((sockd = clamd_connect(cfgfile, "NotifyClamd")) < 0)

+	return 1;

+

+    if(sendln(sockd, "RELOAD", 7) < 0) {

+	logg("!NotifyClamd: Could not write to clamd socket\n");

+	perror("send()");

 	closesocket(sockd);

-	optfree(opts);

 	return 1;

     }

-    /* TODO: Handle timeout */

     memset(buff, 0, sizeof(buff));

-    if((bread = recv(sockd, buff, sizeof(buff), 0)) > 0)

+    if((bread = recv(sockd, buff, sizeof(buff), 0)) > 0) {

 	if(!strstr(buff, "RELOADING")) {

-	    logg("^Clamd was NOT notified: Unknown answer from clamd: '%s'\n", buff);

+	    logg("!NotifyClamd: Unknown answer from clamd: '%s'\n", buff);

 	    closesocket(sockd);

-	    optfree(opts);

 	    return 1;

 	}

+    }

     closesocket(sockd);

     logg("Clamd successfully notified about the update.\n");

-    optfree(opts);

     return 0;

 }

-

 #endif

@@ -20,5 +20,6 @@

 #define __NOTIFY_H

 int notify(const char *cfgfile);

+int clamd_connect(const char *cfgfile, const char *option);

 #endif

@@ -177,7 +177,7 @@ const struct clam_option __clam_options[] = {

     { "LogVerbose", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Enable verbose logging.", "yes" },

-    { "ExtendedDetectionInfo", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Provide additional information about the infected file, such as its\nsize and hash, together with the virus name.", "yes" },

+    { "ExtendedDetectionInfo", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Log additional information about the infected file, such as its\nsize and hash, together with the virus name.", "yes" },

     { "PidFile", "pid", 'p', TYPE_STRING, NULL, -1, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Save the process ID to a file.", "/var/run/clam.pid" },

@@ -390,7 +390,7 @@ const struct clam_option __clam_options[] = {

     { "ReceiveTimeout", NULL, 0, TYPE_NUMBER, MATCH_NUMBER, 30, NULL, 0, OPT_FRESHCLAM, "Timeout in seconds when reading from database server.", "30" },

-    { "SubmitDetectionStats", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM, "When enabled freshclam will submit statistics to the ClamAV Project about\nthe latest virus detections in your environment. The ClamAV maintainers\nwill then use this data to determine what types of malware are the most\ndetected in the field and in what geographic area they are.\nThis feature requires LogTime and LogFile to be enabled in clamd.conf.", "/path/to/clamd.conf" },

+    { "SubmitDetectionStats", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM, "When enabled freshclam will submit statistics to the ClamAV Project about\nthe latest virus detections in your environment. The ClamAV maintainers\nwill then use this data to determine what types of malware are the most\ndetected in the field and in what geographic area they are.\nFreshclam will connect to clamd in order to get recent statistics.", "/path/to/clamd.conf" },

     { "DetectionStatsCountry", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM, "Country of origin of malware/detection statistics (for statistical\npurposes only). The statistics collector at ClamAV.net will look up\nyour IP address to determine the geographical origin of the malware\nreported by your installation. If this installation is mainly used to\nscan data which comes from a different location, please enable this\noption and enter a two-letter code (see http://www.iana.org/domains/root/db/)\nof the country of origin.", "country-code" },