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

+Tue Oct 28 20:37:35 CET 2008 (tk)

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

+  * freshclam: add new config option DetectionStatsCountry

+

 Tue Oct 28 10:52:41 CET 2008 (tk)

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

   * freshclam: re-enable --submit-stats (bb#1235)

@@ -148,6 +148,11 @@ Default: 30

 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. The path for clamd.conf file must be provided.

 .br

 Default: disabled

+.TP

+\fBDetectionStatsCountry STRING\fR

+Country of origin of malware/detection statistics (for statistical purposes only). The statistics collector at ClamAV.net will look up your IP address to determine the geographical origin of the malware reported by your installation. If this installation is mainly used to scan data which comes from a different location, please enable this option and enter a two-letter code (see http://www.iana.org/domains/root/db/) of the country of origin.

+.br

+Default: disabled

 .SH "FILES"

 .LP 

 @CFGDIR@/freshclam.conf

@@ -149,3 +149,13 @@ DatabaseMirror database.clamav.net

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

 # Default: no

 #SubmitDetectionStats /path/to/clamd.conf

+

+# Country of origin of malware/detection statistics (for statistical

+# purposes only). The statistics collector at ClamAV.net will look up

+# your IP address to determine the geographical origin of the malware

+# reported by your installation. If this installation is mainly used to

+# scan data which comes from a different location, please enable this

+# option and enter a two-letter code (see http://www.iana.org/domains/root/db/)

+# of the country of origin.

+# Default: disabled

+#DetectionStatsCountry country-code

@@ -475,7 +475,7 @@ int submitstats(const char *clamdcfg, const struct cfgstruct *copt)

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

 	char logfile[256], fbuff[FILEBUFF];

 	char *pt, *pt2;

-	const char *line;

+	const char *line, *country = NULL;

 	struct cfgstruct *clamdopt;

 	const struct cfgstruct *cpt;

 	struct stat sb;

@@ -484,6 +484,14 @@ int submitstats(const char *clamdcfg, const struct cfgstruct *copt)

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

+    if((cpt = cfgopt(copt, "DetectionStatsCountry"))->enabled) {

+	if(strlen(cpt->strarg) != 2 || !isalpha(cpt->strarg[0]) || !isalpha(cpt->strarg[1])) {

+	    logg("!SubmitDetectionStats: DetectionStatsCountry requires a two-letter country code\n");

+	    return 56;

+	}

+	country = cpt->strarg;

+    }

+

     if(!(clamdopt = getcfg(clamdcfg, 1))) {

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

 	return 56;

@@ -547,7 +555,7 @@ int submitstats(const char *clamdcfg, const struct cfgstruct *copt)

     if((cpt = cfgopt(copt, "HTTPUserAgent"))->enabled)

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

     else

-	snprintf(uastr, sizeof(uastr), PACKAGE"/%s (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")", get_version());

+	snprintf(uastr, sizeof(uastr), PACKAGE"/%s (OS: "TARGET_OS_TYPE", ARCH: "TARGET_ARCH_TYPE", CPU: "TARGET_CPU_TYPE")%s%s", get_version(), country ? ":" : "", country ? country : "");

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

     ret = 0;

@@ -129,6 +129,7 @@ struct cfgoption cfg_options[] = {

     {"ConnectTimeout", OPT_NUM, 30, NULL, 0, OPT_FRESHCLAM},

     {"ReceiveTimeout", OPT_NUM, 30, NULL, 0, OPT_FRESHCLAM},

     {"SubmitDetectionStats", OPT_QUOTESTR, -1, NULL, 0, OPT_FRESHCLAM},

+    {"DetectionStatsCountry", OPT_QUOTESTR, -1, NULL, 0, OPT_FRESHCLAM},

     {"DevACOnly", OPT_BOOL, -1, NULL, 0, OPT_CLAMD},

     {"DevACDepth", OPT_NUM, -1, NULL, 0, OPT_CLAMD},