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

+Wed Apr 27 15:07:22 CEST 2011 (tk)

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

+ * freshclam: add mirror statistics mechanism

+

 Mon Apr 18 17:23:10 CEST 2011 (acab)

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

  * clamd, win32: Conversion to UTF8 is hopefully completefinal.

@@ -41,11 +41,11 @@

 #define PACKETSZ 512

 #endif

-char *txtquery(const char *domain, unsigned int *ttl)

+char *dnsquery(const char *domain, int qtype, unsigned int *ttl)

 {

 	unsigned char answer[PACKETSZ], *answend, *pt;

 	char *txt, host[128];

-	int len, type, qtype;

+	int len, type;

 	unsigned int cttl, size, txtlen = 0;

@@ -59,7 +59,6 @@ char *txtquery(const char *domain, unsigned int *ttl)

     logg("*Querying %s\n", domain);

     memset(answer, 0, PACKETSZ);

-    qtype = T_TXT;

     if((len = res_query(domain, C_IN, qtype, answer, PACKETSZ)) < 0 || len > PACKETSZ) {

 #ifdef FRESHCLAM_DNS_FIX

 	/*  The DNS server in the SpeedTouch Alcatel 510 modem can't

@@ -68,16 +67,22 @@ char *txtquery(const char *domain, unsigned int *ttl)

 	 *  to resolve normally only has a TXT-record anyway.  

 	 */

 	memset(answer, 0, PACKETSZ);

-	qtype=T_ANY;

+	if(qtype == T_TXT)

+	    qtype = T_ANY;

 	if((len = res_query(domain, C_IN, qtype, answer, PACKETSZ)) < 0) {

-	    logg("^Can't query %s\n", domain);

+	    logg("%cCan't query %s\n", (qtype == T_TXT || qtype == T_ANY) ? '^' : '*', domain);

 	    return NULL;

 	}

 #else

-	logg("^Can't query %s\n", domain);

+	logg("%cCan't query %s\n", (qtype == T_TXT) ? '^' : '*', domain);

 	return NULL;

 #endif

     }

+    if(qtype != T_TXT && qtype != T_ANY) {

+	if(ttl)

+	    *ttl = 2;

+	return NULL;

+    }

     answend = answer + len;

     pt = answer + sizeof(HEADER);

@@ -145,9 +150,10 @@ char *txtquery(const char *domain, unsigned int *ttl)

 #else

-char *txtquery(const char *domain, unsigned int *ttl)

+char *dnsquery(const char *domain, int qtype, unsigned int *ttl)

 {

-    *ttl = 1;  /* ttl of 1 combined with a NULL return distinguishes a failed lookup from DNS queries not being available */

+    if(ttl)

+	*ttl = 1;  /* ttl of 1 combined with a NULL return distinguishes a failed lookup from DNS queries not being available */

     return NULL;

 }

@@ -20,6 +20,18 @@

 #ifndef __DNS_H

 #define __DNS_H

-char *txtquery(const char *domain, unsigned int *ttl);

+#if HAVE_CONFIG_H

+#include "clamav-config.h"

+#endif

+

+#ifdef HAVE_RESOLV_H

+#ifndef _WIN32

+#include <netinet/in.h>

+#include <arpa/nameser.h>

+#endif

+#include <resolv.h>

+#endif

+

+char *dnsquery(const char *domain, int qtype, unsigned int *ttl);

 #endif

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

 	const char *hostpt;

     if(ip)

-	strcpy(ip, "???");

+	strcpy(ip, "UNKNOWN");

     if(proxy) {

 	hostpt = proxy;

@@ -1555,13 +1555,21 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

 	unsigned int nodb = 0, currver = 0, newver = 0, port = 0, i, j;

 	int ret, ims = -1;

 	char *pt, cvdfile[32], localname[32], *tmpdir = NULL, *newfile, *newfile2, newdb[32];

-	char extradbinfo[64], *extradnsreply = NULL;

+	char extradbinfo[64], *extradnsreply = NULL, squery[64];

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

 	unsigned int flevel = cl_retflevel(), remote_flevel = 0, maxattempts;

-	unsigned int can_whitelist = 0;

+	unsigned int can_whitelist = 0, mirror_stats = 0;

+#ifdef _WIN32

+	unsigned int w32 = 1;

+#else

+	unsigned int w32 = 0;

+#endif

 	int ctimeout, rtimeout;

+    if(cli_strbcasestr(hostname, ".clamav.net"))

+	mirror_stats = 1;

+

     snprintf(cvdfile, sizeof(cvdfile), "%s.cvd", dbname);

     if(!(current = currentdb(dbname, localname))) {

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

 #ifdef HAVE_RESOLV_H

     else if(!nodb && extra && !optget(opts, "no-dns")->enabled) {

 	snprintf(extradbinfo, sizeof(extradbinfo), "%s.cvd.clamav.net", dbname);

-	if((extradnsreply = txtquery(extradbinfo, NULL))) {

+	if((extradnsreply = dnsquery(extradbinfo, T_TXT, NULL))) {

 	    if((pt = cli_strtok(extradnsreply, 1, ":"))) {

 		    int rt;

 		    time_t ct;

@@ -1681,12 +1689,20 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

 	if(!nodb && !ims) {

 	    logg("%s is up to date (version: %d, sigs: %d, f-level: %d, builder: %s)\n", localname, current->version, current->sigs, current->fl, current->builder);

 	    *signo += current->sigs;

+	    if(mirror_stats) {

+		snprintf(squery, sizeof(squery), "%s.%u.%u.%u.%u.%s.ping.clamav.net", dbname, current->version, flevel, 1, w32, ip);

+		dnsquery(squery, T_A, NULL);

+	    }

 	    cl_cvdfree(current);

 	    return 1;

 	}

 	if(!remote) {

 	    logg("^Can't read %s header from %s (IP: %s)\n", cvdfile, hostname, ip);

+	    if(mirror_stats) {

+		snprintf(squery, sizeof(squery), "%s.%u.%u.%u.%u.%s.ping.clamav.net", dbname, current->version + 1, flevel, 0, w32, ip);

+		dnsquery(squery, T_A, NULL);

+	    }

 	    cl_cvdfree(current);

 	    return 58;

 	}

@@ -1710,7 +1726,6 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

 	return 1;

     }

-

     if(current) {

 	currver = current->version;

 	cl_cvdfree(current);

@@ -1741,6 +1756,10 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

     if(nodb) {

 	ret = getcvd(cvdfile, newfile, hostname, ip, localip, proxy, port, user, pass, uas, newver, ctimeout, rtimeout, mdat, logerr, can_whitelist, opts);

 	if(ret) {

+	    if(mirror_stats) {

+		snprintf(squery, sizeof(squery), "%s.%u.%u.%u.%u.%s.ping.clamav.net", dbname, 0, flevel, 0, w32, ip);

+		dnsquery(squery, T_A, NULL);

+	    }

 	    memset(ip, 0, 16);

 	    free(newfile);

 	    return ret;

@@ -1759,6 +1778,10 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

 		    llogerr = (j == maxattempts - 1);

 		ret = getpatch(dbname, tmpdir, i, hostname, ip, localip, proxy, port, user, pass, uas, ctimeout, rtimeout, mdat, llogerr, can_whitelist, opts);

 		if(ret == 52 || ret == 58) {

+		    if(mirror_stats) {

+			snprintf(squery, sizeof(squery), "%s.%u.%u.%u.%u.%s.ping.clamav.net", dbname, i, flevel, 0, w32, ip);

+			dnsquery(squery, T_A, NULL);

+		    }

 		    memset(ip, 0, 16);

 		    continue;

 		} else {

@@ -1777,6 +1800,10 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

 	    mirman_whitelist(mdat, 2);

 	    ret = getcvd(cvdfile, newfile, hostname, ip, localip, proxy, port, user, pass, uas, newver, ctimeout, rtimeout, mdat, logerr, can_whitelist, opts);

 	    if(ret) {

+		if(mirror_stats) {

+		    snprintf(squery, sizeof(squery), "%s.%u.%u.%u.%u.%s.ping.clamav.net", dbname, 0, flevel, 0, w32, ip);

+		    dnsquery(squery, T_A, NULL);

+		}

 		free(newfile);

 		return ret;

 	    }

@@ -1872,6 +1899,10 @@ static int updatedb(const char *dbname, const char *hostname, char *ip, int *sig

     }

     *signo += current->sigs;

+    if(mirror_stats) {

+	snprintf(squery, sizeof(squery), "%s.%u.%u.%u.%u.%s.ping.clamav.net", dbname, current->version, flevel, 1, w32, ip);

+	dnsquery(squery, T_A, NULL);

+    }

     cl_cvdfree(current);

     return 0;

 }

@@ -2071,7 +2102,7 @@ int downloadmanager(const struct optstruct *opts, const char *hostname, int loge

     if(optget(opts, "no-dns")->enabled) {

 	dnsreply = NULL;

     } else {

-	if((dnsreply = txtquery(dnsdbinfo, &ttl))) {

+	if((dnsreply = dnsquery(dnsdbinfo, T_TXT, &ttl))) {

 	    logg("*TTL: %d\n", ttl);

 	    if((pt = cli_strtok(dnsreply, 3, ":"))) {