@@ -63,15 +63,10 @@ Example

 # Default: current.cvd.clamav.net

 #DNSDatabaseInfo current.cvd.clamav.net

-# Uncomment the following line and replace XY with your country

-# code. See https://www.iana.org/domains/root/db for the full list.

-# You can use db.XY.ipv6.clamav.net for IPv6 connections.

-#DatabaseMirror db.XY.clamav.net

-

-# database.clamav.net is a round-robin record which points to our most 

-# reliable mirrors. It's used as a fall back in case db.XY.clamav.net is 

-# not working. DO NOT TOUCH the following line unless you know what you

-# are doing.

+# database.clamav.net is now the primary domain name to be used world-wide.

+# Now that CloudFlare is being used as our Content Delivery Network (CDN), 

+# this one domain name works world-wide to direct freshclam to the closest 

+# geographic endpoint.

 DatabaseMirror database.clamav.net

 # How many attempts to make before giving up.

@@ -678,7 +678,16 @@ remote_cvdhead (const char *cvdfile, const char *localfile,

         && !strstr (buffer, "HTTP/1.1 206")

         && !strstr (buffer, "HTTP/1.0 206"))

     {

-        logg ("%cUnknown response from remote server\n", logerr ? '!' : '^');

+        char * respcode = NULL;

+        if ((NULL != (respcode = strstr (buffer, "HTTP/1.0 "))) ||

+            (NULL != (respcode = strstr (buffer, "HTTP/1.1 ")))) {

+            /* There was some sort of response code...*/

+            respcode = cli_strndup(respcode, MIN(FILEBUFF - (size_t)(respcode - buffer), 13));

+            logg ("%cremote_cvdhead: Unknown response from %s (IP: %s): %s\n", logerr ? '!' : '^', hostname, ipaddr, respcode);

+            free (respcode);

+        } else {

+            logg ("%cremote_cvdhead: Unknown response from %s (IP: %s)\n", logerr ? '!' : '^', hostname, ipaddr);

+        }

         mirman_update (mdat->currip, mdat->af, mdat, 1);

         return NULL;

     }

@@ -882,13 +891,27 @@ getfile_mirman (const char *srcfile, const char *destfile,

     if (!strstr (buffer, "HTTP/1.1 200") && !strstr (buffer, "HTTP/1.0 200")

         && !strstr (buffer, "HTTP/1.1 206")

         && !strstr (buffer, "HTTP/1.0 206"))

-    {

-        if (proxy)

-            logg ("%cgetfile: Unknown response from %s\n",

-                  logerr ? '!' : '^', hostname);

-        else

-            logg ("%cgetfile: Unknown response from %s (IP: %s)\n",

-                  logerr ? '!' : '^', hostname, ipaddr);

+    {        char * respcode = NULL;

+        if ((NULL != (respcode = strstr (buffer, "HTTP/1.0 "))) ||

+            (NULL != (respcode = strstr (buffer, "HTTP/1.1 ")))) {

+            /* There was some sort of response code...*/

+            respcode = cli_strndup(respcode, MIN(FILEBUFF - (size_t)(respcode - buffer), 13));

+            if (proxy)

+                logg ("%cgetfile: Unknown response from %s: %s\n",

+                    logerr ? '!' : '^', hostname, respcode);

+            else

+                logg ("%cgetfile: Unknown response from %s (IP: %s): %s\n",

+                    logerr ? '!' : '^', hostname, ipaddr, respcode);

+            free (respcode);

+        }

+        else {

+            if (proxy)

+                logg ("%cgetfile: Unknown response from %s\n",

+                    logerr ? '!' : '^', hostname);

+            else

+                logg ("%cgetfile: Unknown response from %s (IP: %s)\n",

+                    logerr ? '!' : '^', hostname, ipaddr);

+        }

         if (mdat)

             mirman_update (mdat->currip, mdat->af, mdat, 1);

         return FCE_FAILEDGET;

@@ -1116,10 +1139,17 @@ getcvd (const char *cvdfile, const char *newfile, const char *hostname,

     if (cvd->version < newver)

     {

         logg ("^Mirror %s is not synchronized.\n", ip);

-        mirman_update (mdat->currip, mdat->af, mdat, 2);

-        cl_cvdfree (cvd);

         unlink (newfile);

-        return FCE_MIRRORNOTSYNC;

+        if (cvd->version < newver - 1)

+        {

+            logg ("^Mirror is more than 1 version out of date. Recording mirror failure.\n");

+            mirman_update (mdat->currip, mdat->af, mdat, FCE_MIRRORNOTSYNC);

+            cl_cvdfree (cvd);

+            return FCE_MIRRORNOTSYNC;

+        }

+

+        cl_cvdfree (cvd);

+        return FC_UPTODATE;

     }

     cl_cvdfree (cvd);

@@ -50,8 +50,8 @@

 #endif

 #endif

-#define IGNORE_LONG	3 * 86400

-#define IGNORE_SHORT	6 * 3600

+#define IGNORE_SHORT    (3600)              /* 1 hour */

+#define IGNORE_LONG     (6 * IGNORE_SHORT)  /* 6 hours */

 void

 mirman_free (struct mirdat *mdat)

@@ -315,8 +315,28 @@ mirman_list (const struct mirdat *mdat)

         printf ("Successes: %u\n", mdat->mirtab[i].succ);

         printf ("Failures: %u\n", mdat->mirtab[i].fail);

         tm = mdat->mirtab[i].atime;

-        printf ("Last access: %s", ctime ((const time_t *) &tm));

-        printf ("Ignore: %s\n", mdat->mirtab[i].ignore ? "Yes" : "No");

+        printf("Last access: %s", ctime((const time_t *) &tm));

+        if (mdat->mirtab[i].ignore) {

+            time_t ignore_expires = tm + ((mdat->mirtab[i].ignore == 1) ? IGNORE_LONG

+                                                                        : IGNORE_SHORT);

+            double difference = difftime(ignore_expires, time(NULL));

+            if (difference > 0) {

+                uint32_t remaining = difference;

+                uint32_t seconds, minutes, hours;

+                seconds = remaining % 60;

+                remaining = remaining / 60;

+                minutes = remaining % 60;

+                remaining = remaining / 60;

+                hours = remaining % 60;

+

+                printf("Ignore: Yes,  %d hours %d minutes %d seconds remaining.\n",

+                    hours, minutes, seconds);

+            } else {

+                printf("Ignore: No\n");

+            }

+        } else {

+            printf("Ignore: No\n");

+        }

         if (i != mdat->num - 1)

             printf ("-------------------------------------\n");

     }