@@ -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.

@@ -186,9 +186,13 @@ help (void)

 static int

 download (const struct optstruct *opts, const char *cfgfile)

 {

+    time_t currtime;

     int ret = 0, try = 1, maxattempts = 0;

     const struct optstruct *opt;

+    time(&currtime);

+    logg("ClamAV update process started at %s", ctime(&currtime));

+    logg("*Using IPv6 aware code\n");

     maxattempts = optget (opts, "MaxAttempts")->numarg;

     logg ("*Max retries == %d\n", maxattempts);

@@ -225,6 +229,7 @@ download (const struct optstruct *opts, const char *cfgfile)

                     {

                         logg ("Update failed. Your network may be down or none of the mirrors listed in %s is working. Check https://www.clamav.net/documents/official-mirror-faq for possible reasons.\n", cfgfile);

                     }

+                    try = 1;

                 }

             }

@@ -299,7 +304,7 @@ main (int argc, char **argv)

     {

         help ();

         optfree (opts);

-        return 0;

+        return FC_SUCCESS;

     }

     /* check foreground option from command line to override config file */

@@ -337,7 +342,7 @@ main (int argc, char **argv)

     {

         print_version (optget (opts, "DatabaseDirectory")->strarg);

         optfree (opts);

-        return 0;

+        return FC_SUCCESS;

     }

     if (optget (opts, "HTTPProxyPassword")->enabled)

@@ -492,7 +497,7 @@ main (int argc, char **argv)

     if (optget (opts, "list-mirrors")->enabled)

     {

-        if (mirman_read ("mirrors.dat", &mdat, 1) == -1)

+        if (mirman_read("mirrors.dat", &mdat, 1) != FC_SUCCESS)

         {

             printf ("Can't read mirrors.dat\n");

             optfree (opts);

@@ -501,7 +506,7 @@ main (int argc, char **argv)

         mirman_list (&mdat);

         mirman_free (&mdat);

         optfree (opts);

-        return 0;

+        return FC_SUCCESS;

     }

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

@@ -20,29 +20,34 @@

 #ifndef __FRESHCLAMCODES_H

 #define __FRESHCLAMCODES_H

-#define FC_UPTODATE        1

+typedef enum fc_error_tag {

+    FC_SUCCESS          = 0,

+    FC_UPTODATE         = 1,

-#define FCE_INIT          40

-#define FCE_CHECKS        41

-#define FCE_PRIVATEMIRROR 45

+    FCE_INIT            = 40,

+    FCE_CHECKS          = 41,

+    FCE_PRIVATEMIRROR   = 45,

-#define FCE_DIRECTORY     50

-#define FCE_CONNECTION    52

-#define FCE_EMPTYFILE     53

-#define FCE_BADCVD        54

-#define FCE_FILE          55

+    FCE_DIRECTORY       = 50,

+    FCE_CONNECTION      = 52,

+    FCE_EMPTYFILE       = 53,

+    FCE_BADCVD          = 54,

+    FCE_FILE            = 55,

 /* TESTFAIL is also 55, consider moving to new value */

-#define FCE_TESTFAIL      55

-#define FCE_CONFIG        56

-#define FCE_DBDIRACCESS   57

-#define FCE_FAILEDGET     58

-#define FCE_MIRRORNOTSYNC 59

+    FCE_TESTFAIL        = 55,

+    FCE_CONFIG          = 56,

+    FCE_DBDIRACCESS     = 57,

+    FCE_FAILEDGET       = 58,

+    FCE_MIRRORNOTSYNC   = 59,

-#define FCE_USERINFO      60

-#define FCE_USERORGROUP   61

-#define FCE_LOGGING       62

+    FCE_USERINFO        = 60,

+    FCE_USERORGROUP     = 61,

+    FCE_LOGGING         = 62,

-#define FCE_FAILEDUPDATE  70

-#define FCE_MEM           75

+    FCE_FAILEDUPDATE    = 70,

+    FCE_MEM             = 75,

+    FCE_ARG             = 76,

+    FCE_OPEN            = 77

+} fc_error_t;

 #endif

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

             const char *localip, int ctimeout, struct mirdat *mdat,

             int logerr, unsigned int can_whitelist, unsigned int attempt)

 {

+    mir_status_t mirror_status = MIRROR_OK;

     int socketfd, port, ret;

     unsigned int ips = 0, ignored = 0, i;

     struct addrinfo hints, *res = NULL, *rp, *loadbal_rp = NULL, *addrs[128];

@@ -193,7 +194,7 @@ wwwconnect (const char *server, const char *proxy, int pport, char *ip,

     uint32_t loadbal = 1, minsucc = 0xffffffff, minfail =

         0xffffffff, addrnum = 0;

     int ipv4start = -1, ipv4end = -1;

-    struct mirdat_ip *md;

+    struct mirdat_ip *md = NULL;

     char ipaddr[46];

     const char *hostpt;

@@ -288,25 +289,32 @@ wwwconnect (const char *server, const char *proxy, int pport, char *ip,

             return -1;

         }

-        if (mdat && (ret = mirman_check (addr, rp->ai_family, mdat, &md)))

+        if (mdat)

         {

-            if (ret == 1)

-                logg ("*Ignoring mirror %s (due to previous errors)\n",

-                      ipaddr);

-            else

-                logg ("*Ignoring mirror %s (has connected too many times with an outdated version)\n", ipaddr);

-

-            ignored++;

-            if (!loadbal || i + 1 < addrnum)

+            if (FC_SUCCESS != (ret = mirman_check (addr, rp->ai_family, mdat, &md, &mirror_status)))

             {

-                i++;

-                continue;

+                logg ("!Failed to check mirrors.dat!\n");

+                return -1;

+            }

+            else if (MIRROR_OK != mirror_status)

+            {

+                if (MIRROR_IGNORE__PREV_ERRS == mirror_status)

+                    logg ("*Ignoring mirror %s (due to previous errors)\n", ipaddr);

+                else if (MIRROR_IGNORE__OUTDATED_VERSION == mirror_status)

+                    logg ("*Ignoring mirror %s (has connected too many times with an outdated version)\n", ipaddr);

+

+                ignored++;

+                if (!loadbal || i + 1 < addrnum)

+                {

+                    i++;

+                    continue;

+                }

             }

         }

         if (mdat && loadbal)

         {

-            if (!ret)

+            if (MIRROR_OK == mirror_status)

             {

                 if (!md)

                 {

@@ -387,7 +395,7 @@ wwwconnect (const char *server, const char *proxy, int pport, char *ip,

             else

                 i++;

             if (mdat)

-                mirman_update (addr, rp->ai_family, mdat, 2);

+                mirman_update (addr, rp->ai_family, mdat, FCE_CONNECTION);

             continue;

         }

         else

@@ -647,7 +655,7 @@ remote_cvdhead (const char *cvdfile, const char *localfile,

     {

         logg ("%cremote_cvdhead: Error while reading CVD header from %s\n",

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

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

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

         return NULL;

     }

@@ -656,7 +664,7 @@ remote_cvdhead (const char *cvdfile, const char *localfile,

     {

         logg ("%c%s not found on remote server\n", logerr ? '!' : '^',

               cvdfile);

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

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

         return NULL;

     }

@@ -667,7 +675,7 @@ remote_cvdhead (const char *cvdfile, const char *localfile,

         /* mirror status: up to date */

         *ims = 0;

         logg ("OK (IMS)\n");

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

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

         return NULL;

     }

     else

@@ -680,8 +688,18 @@ 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 ? '!' : '^');

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

+        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...*/

+            char * httpcode = calloc(MIN(FILEBUFF - (size_t)(respcode - buffer), 13) + 1, 1);

+            memcpy(httpcode, respcode, MIN(FILEBUFF - (size_t)(respcode - buffer), 13));

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

+            free (httpcode);

+        } else {

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

+        }

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

         return NULL;

     }

@@ -704,7 +722,7 @@ remote_cvdhead (const char *cvdfile, const char *localfile,

     {

         logg ("%cremote_cvdhead: Malformed CVD header (too short)\n",

               logerr ? '!' : '^');

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

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

         return NULL;

     }

@@ -716,7 +734,7 @@ remote_cvdhead (const char *cvdfile, const char *localfile,

         {

             logg ("%cremote_cvdhead: Malformed CVD header (bad chars)\n",

                   logerr ? '!' : '^');

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

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

             return NULL;

         }

         head[j] = ch[j];

@@ -726,18 +744,18 @@ remote_cvdhead (const char *cvdfile, const char *localfile,

     {

         logg ("%cremote_cvdhead: Malformed CVD header (can't parse)\n",

               logerr ? '!' : '^');

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

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

     }

     else

     {

         logg ("OK\n");

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

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

     }

     return cvd;

 }

-static int

+static fc_error_t

 getfile_mirman (const char *srcfile, const char *destfile,

                 const char *hostname, char *ip, const char *localip,

                 const char *proxy, int port, const char *user,

@@ -757,6 +775,8 @@ getfile_mirman (const char *srcfile, const char *destfile,

     UNUSEDPARAM(ctimeout);

     UNUSEDPARAM(can_whitelist);

+    memset (buffer, 0, sizeof(FILEBUFF));

+

     if (proxy)

     {

         remotename = malloc (strlen (hostname) + 8);

@@ -842,7 +862,7 @@ getfile_mirman (const char *srcfile, const char *destfile,

             else

                 logg ("%cgetfile: Error while reading database from %s (IP: %s): %s\n", logerr ? '!' : '^', hostname, ipaddr, strerror (errno));

             if (mdat)

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

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

             return FCE_CONNECTION;

         }

@@ -869,7 +889,7 @@ getfile_mirman (const char *srcfile, const char *destfile,

                   ipaddr);

         if (mdat)

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

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

         return FCE_FAILEDGET;

     }

@@ -877,7 +897,7 @@ getfile_mirman (const char *srcfile, const char *destfile,

     if (strstr (buffer, "HTTP/1.1 304") || strstr (buffer, "HTTP/1.0 304"))

     {

         if (mdat)

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

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

         return FC_UPTODATE;

     }

@@ -885,14 +905,30 @@ getfile_mirman (const char *srcfile, const char *destfile,

         && !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...*/

+            char * httpcode = calloc(MIN(FILEBUFF - (size_t)(respcode - buffer), 13) + 1, 1);

+            memcpy(httpcode, respcode, MIN(FILEBUFF - (size_t)(respcode - buffer), 13));

+            if (proxy)

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

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

+            else

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

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

+            free (httpcode);

+        }

+        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);

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

         return FCE_FAILEDGET;

     }

@@ -983,7 +1019,7 @@ getfile_mirman (const char *srcfile, const char *destfile,

             logg ("%cgetfile: Download interrupted: %s (IP: %s)\n",

                   logerr ? '!' : '^', strerror (errno), ipaddr);

         if (mdat)

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

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

         return FCE_CONNECTION;

     }

@@ -996,8 +1032,8 @@ getfile_mirman (const char *srcfile, const char *destfile,

         logg ("Downloading %s [*]\n", fname);

     if (mdat)

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

-    return 0;

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

+    return FC_SUCCESS;

 }

 static int

@@ -1024,23 +1060,13 @@ getfile (const char *srcfile, const char *destfile, const char *hostname,

     if (sd < 0)

         return FCE_CONNECTION;

-    if (mdat)

-    {

-        mirman_update_sf (mdat->currip, mdat->af, mdat, 0, 1);

-        mirman_write ("mirrors.dat", dbdir, mdat);

-    }

-

-    ret =

-        getfile_mirman (srcfile, destfile, hostname, ip, localip, proxy, port,

+    ret = getfile_mirman (srcfile, destfile, hostname, ip, localip, proxy, port,

                         user, pass, uas, ctimeout, rtimeout, mdat, logerr,

                         can_whitelist, ims, ipaddr, sd);

     closesocket (sd);

-    if (mdat)

-    {

-        mirman_update_sf (mdat->currip, mdat->af, mdat, 0, -1);

-        mirman_write ("mirrors.dat", dbdir, mdat);

-    }

+    /* Update mirrors.dat */

+    (void) mirman_write ("mirrors.dat", dbdir, mdat);

     return ret;

 }

@@ -1118,14 +1144,21 @@ 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);

-    return 0;

+    return FC_SUCCESS;

 }

 static int

@@ -1251,7 +1284,7 @@ getpatch (const char *dbname, const char *tmpdir, int version,

         logg ("!getpatch: Can't chdir to %s\n", olddir);

         return FCE_DIRECTORY;

     }

-    return 0;

+    return FC_SUCCESS;

 }

 static struct cl_cvd *

@@ -1508,7 +1541,7 @@ test_database (const char *newfile, const char *newdb, int bytecode)

         && engine->domainlist_matcher->sha256_pfx_set.keys)

         cli_hashset_destroy (&engine->domainlist_matcher->sha256_pfx_set);

     cl_engine_free (engine);

-    return 0;

+    return FC_SUCCESS;

 }

 #ifndef WIN32

@@ -1582,7 +1615,7 @@ test_database_wrap (const char *file, const char *newdb, int bytecode)

             }

             if (firstline[0])

                 logg ("^Database successfully loaded, but there is stderr output\n");

-            return 0;

+            return FC_SUCCESS;

         }

         if (WIFSIGNALED (status))

         {

@@ -2260,7 +2293,7 @@ updatedb (const char *dbname, const char *hostname, char *ip, int *signo,

     }

 #endif

     cl_cvdfree (current);

-    return 0;

+    return FC_SUCCESS;

 }

 static int

@@ -2480,14 +2513,13 @@ updatecustomdb (const char *url, int *signo, const struct optstruct *opts,

     logg ("%s updated (version: custom database, sigs: %u)\n", dbname, sigs);

     *signo += sigs;

-    return 0;

+    return FC_SUCCESS;

 }

 int

 downloadmanager (const struct optstruct *opts, const char *hostname,

                  unsigned int attempt)

 {

-    time_t currtime;

     int ret, custret = 0, updated = 0, outdated = 0, signo = 0, logerr;

     unsigned int ttl;

     char ipaddr[46], *dnsreply = NULL, *pt, *localip = NULL, *newver = NULL;

@@ -2512,10 +2544,6 @@ downloadmanager (const struct optstruct *opts, const char *hostname,

         return FCE_DBDIRACCESS;

     }

-    time (&currtime);

-    logg ("ClamAV update process started at %s", ctime (&currtime));

-    logg ("*Using IPv6 aware code\n");

-

 #ifdef HAVE_RESOLV_H

     dnsdbinfo = optget (opts, "DNSDatabaseInfo")->strarg;

@@ -2635,7 +2663,7 @@ downloadmanager (const struct optstruct *opts, const char *hostname,

                 }

                 free (dnsreply);

                 free (newver);

-                mirman_write ("mirrors.dat", dbdir, &mdat);

+                (void) mirman_write ("mirrors.dat", dbdir, &mdat);

                 mirman_free (&mdat);

                 cli_rmdirs (updtmpdir);

                 return custret;

@@ -2663,7 +2691,7 @@ downloadmanager (const struct optstruct *opts, const char *hostname,

                     free (dnsreply);

                 if (newver)

                     free (newver);

-                mirman_write ("mirrors.dat", dbdir, &mdat);

+                (void) mirman_write ("mirrors.dat", dbdir, &mdat);

                 mirman_free (&mdat);

                 cli_rmdirs (updtmpdir);

                 return ret;

@@ -2685,7 +2713,7 @@ downloadmanager (const struct optstruct *opts, const char *hostname,

                 free (dnsreply);

             if (newver)

                 free (newver);

-            mirman_write ("mirrors.dat", dbdir, &mdat);

+            (void) mirman_write ("mirrors.dat", dbdir, &mdat);

             mirman_free (&mdat);

             cli_rmdirs (updtmpdir);

             return ret;

@@ -2702,7 +2730,7 @@ downloadmanager (const struct optstruct *opts, const char *hostname,

                 free (dnsreply);

             if (newver)

                 free (newver);

-            mirman_write ("mirrors.dat", dbdir, &mdat);

+            (void) mirman_write ("mirrors.dat", dbdir, &mdat);

             mirman_free (&mdat);

             cli_rmdirs (updtmpdir);

             return ret;

@@ -2736,7 +2764,7 @@ downloadmanager (const struct optstruct *opts, const char *hostname,

                 free (dnsreply);

             if (newver)

                 free (newver);

-            mirman_write ("mirrors.dat", dbdir, &mdat);

+            (void) mirman_write ("mirrors.dat", dbdir, &mdat);

             mirman_free (&mdat);

             cli_rmdirs (updtmpdir);

             return ret;

@@ -2771,7 +2799,7 @@ downloadmanager (const struct optstruct *opts, const char *hostname,

                 free (dnsreply);

             if (newver)

                 free (newver);

-            mirman_write ("mirrors.dat", dbdir, &mdat);

+            (void) mirman_write ("mirrors.dat", dbdir, &mdat);

             mirman_free (&mdat);

             cli_rmdirs (updtmpdir);

             return ret;

@@ -2793,7 +2821,7 @@ downloadmanager (const struct optstruct *opts, const char *hostname,

                         free (dnsreply);

                     if (newver)

                         free (newver);

-                    mirman_write ("mirrors.dat", dbdir, &mdat);

+                    (void) mirman_write ("mirrors.dat", dbdir, &mdat);

                     mirman_free (&mdat);

                     cli_rmdirs (updtmpdir);

                     return ret;

@@ -2808,7 +2836,7 @@ downloadmanager (const struct optstruct *opts, const char *hostname,

     if (dnsreply)

         free (dnsreply);

-    mirman_write ("mirrors.dat", dbdir, &mdat);

+    (void) mirman_write ("mirrors.dat", dbdir, &mdat);

     mirman_free (&mdat);

     cli_rmdirs (updtmpdir);

@@ -50,11 +50,11 @@

 #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)

+mirman_free(struct mirdat *mdat)

 {

     if (mdat && mdat->num)

     {

@@ -63,34 +63,32 @@ mirman_free (struct mirdat *mdat)

     }

 }

-int

-mirman_read (const char *file, struct mirdat *mdat, uint8_t active)

+fc_error_t mirman_read(const char *file, struct mirdat *mdat, uint8_t active)

 {

     struct mirdat_ip mip;

     int fd, bread;

-

-    memset (mdat, 0, sizeof (struct mirdat));

+    memset (mdat, 0, sizeof(struct mirdat));

     if (!(mdat->active = active))

-        return 0;

+        return FC_SUCCESS;

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

-        return -1;

+        return FCE_OPEN;

-    while ((bread = read (fd, &mip, sizeof (mip))) == sizeof (mip))

+    while ((bread = read (fd, &mip, sizeof(mip))) == sizeof(mip))

     {

         mdat->mirtab =

             (struct mirdat_ip *) realloc (mdat->mirtab,

-                                          (mdat->num + 1) * sizeof (mip));

+                                          (mdat->num + 1) * sizeof(mip));

         if (!mdat->mirtab)

         {

-            logg ("!Can't allocate memory for mdat->mirtab\n");

+            logg("!Can't allocate memory for mdat->mirtab\n");

             mirman_free (mdat);

             close (fd);

-            return -1;

+            return FCE_MEM;

         }

-        memcpy (&mdat->mirtab[mdat->num], &mip, sizeof (mip));

+        memcpy (&mdat->mirtab[mdat->num], &mip, sizeof(mip));

         mdat->num++;

     }

@@ -98,156 +96,136 @@ mirman_read (const char *file, struct mirdat *mdat, uint8_t active)

     if (bread)

     {

-        logg ("^Removing broken %s file.\n", file);

+        logg("^Removing broken %s file.\n", file);

         unlink (file);

         mirman_free (mdat);

-        return -1;

+        return FCE_FILE;

     }

-    return 0;

+    return FC_SUCCESS;

 }

-int

-mirman_check (uint32_t * ip, int af, struct mirdat *mdat,

-              struct mirdat_ip **md)

+fc_error_t mirman_check(uint32_t * ip, int af, struct mirdat *mdat,

+                        struct mirdat_ip **md, mir_status_t *mirror_status)

 {

-    unsigned int i, flevel = cl_retflevel ();

+    fc_error_t status = FC_SUCCESS;

+    unsigned int i;

+    unsigned int flevel = cl_retflevel ();

+    if (NULL == md || NULL == mdat || NULL == ip) {

+        logg("!mirman_check: Invalid arguments.\n");

+        status = FCE_ARG;

+        goto done;

+    }

-    if (md)

-        *md = NULL;

+    *md = NULL;

     if (!mdat->active)

-        return 0;

+    {

+        *mirror_status = MIRROR_OK;

+        goto done;

+    }

     for (i = 0; i < mdat->num; i++)

     {

-

-        if ((af == AF_INET && mdat->mirtab[i].ip4 == *ip)

-            || (af == AF_INET6

-                && !memcmp (mdat->mirtab[i].ip6, ip, 4 * sizeof (uint32_t))))

+        if ((af == AF_INET && mdat->mirtab[i].ip4 == *ip) ||

+            ((af == AF_INET6) && (!memcmp (mdat->mirtab[i].ip6, ip, 4 * sizeof(uint32_t)))))

         {

+            /*

+             * Mirror found in mirror table.

+             */

-            if (!mdat->mirtab[i].atime && !mdat->mirtab[i].ignore)

+            if (mdat->dbflevel && (mdat->dbflevel > flevel) && (mdat->dbflevel - flevel > 3))

             {

-                if (md)

-                    *md = &mdat->mirtab[i];

-                return 0;

+                /* Functionality level of database is lower than

+                 * level of the database we already have */

+                if (difftime(time(NULL), mdat->mirtab[i].atime) < (mdat->dbflevel - flevel) * 3600)

+                {

+                    *mirror_status = MIRROR_IGNORE__OUTDATED_VERSION;

+                    goto done;

+                }

             }

-            if (mdat->dbflevel && (mdat->dbflevel > flevel)

-                && (mdat->dbflevel - flevel > 3))

-                if (time (NULL) - mdat->mirtab[i].atime <

-                    (mdat->dbflevel - flevel) * 3600)

-                    return 2;

-

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

+            if ((mdat->mirtab[i].atime > 0) &&

+                (IGNORE_NO != mdat->mirtab[i].ignore))

             {

-                if (!mdat->mirtab[i].atime)

-                    return 1;

-

-                if (time (NULL) - mdat->mirtab[i].atime > IGNORE_LONG)

+                /*

+                 * Found, but the ignore flag is set.

+                 */

+                if (difftime(time(NULL), mdat->mirtab[i].atime) > IGNORE_LONG)

                 {

-                    mdat->mirtab[i].ignore = 0;

-                    if (md)

-                        *md = &mdat->mirtab[i];

-                    return 0;

+                    /* Long-Ignore timeout expired,

+                     * the mirror can be attempted again */

+                    mdat->mirtab[i].ignore = IGNORE_NO;

+                }

+                else if ((mdat->mirtab[i].ignore == IGNORE_SHORTTERM) &&

+                        (difftime(time(NULL), mdat->mirtab[i].atime) > IGNORE_SHORT))

+                {

+                    /* Mirror was only set to Short-Term ignore...

+                     * the Short-Ignore timeout expired,

+                     * the mirror can be attempted again */

+                    mdat->mirtab[i].ignore = IGNORE_NO;

                 }

                 else

                 {

-                    if (mdat->mirtab[i].ignore == 2

-                        && (time (NULL) - mdat->mirtab[i].atime >

-                            IGNORE_SHORT))

-                    {

-                        if (md)

-                            *md = &mdat->mirtab[i];

-                        return 0;

-                    }

-                    return 1;

+                    *mirror_status = MIRROR_IGNORE__PREV_ERRS;

+                    goto done;

                 }

             }

-            if (md)

-                *md = &mdat->mirtab[i];

-            return 0;

+            /* Mirror found, and is ok to try. */

+            *md = &mdat->mirtab[i];

+            *mirror_status = MIRROR_OK;

+            goto done;

         }

     }

-    return 0;

+    /* Mirror wasn't in mirror table. */

+    *mirror_status = MIRROR_OK;

+

+done:

+

+    return status;

 }

-static int

-mirman_update_int (uint32_t * ip, int af, struct mirdat *mdat, uint8_t broken,

-                   int succ, int fail)

+fc_error_t mirman_update(uint32_t * ip, int af, struct mirdat *mdat, fc_error_t error)

 {

-    unsigned int i, found = 0;

-

+    fc_error_t status = FCE_ARG;

+    unsigned int i = 0;

+    struct mirdat_ip *mirror = NULL;

-    if (!mdat->active)

-        return 0;

+    if (!mdat->active) {

+        /* Disable mirrors.dat management when using a proxy. */

+        return FC_SUCCESS;

+    }

+    /*

+     * Attempt to find the ip in the mirror table.

+     */

     for (i = 0; i < mdat->num; i++)

     {

-        if ((af == AF_INET && mdat->mirtab[i].ip4 == *ip)

-            || (af == AF_INET6

-                && !memcmp (mdat->mirtab[i].ip6, ip, 4 * sizeof (uint32_t))))

+        if (((af == AF_INET) && (mdat->mirtab[i].ip4 == *ip)) ||

+            ((af == AF_INET6) && (!memcmp(mdat->mirtab[i].ip6, ip, 4 * sizeof(uint32_t)))))

         {

-            found = 1;

+            mirror = &mdat->mirtab[i];

             break;

         }

     }

-    if (found)

-    {

-        mdat->mirtab[i].atime = 0;  /* will be updated in mirman_write() */

-        if (succ || fail)

-        {

-            if ((int) mdat->mirtab[i].fail + fail < 0)

-                mdat->mirtab[i].fail = 0;

-            else

-                mdat->mirtab[i].fail += fail;

-

-            if ((int) mdat->mirtab[i].succ + succ < 0)

-                mdat->mirtab[i].succ = 0;

-            else

-                mdat->mirtab[i].succ += succ;

-        }

-        else

-        {

-            if (broken)

-                mdat->mirtab[i].fail++;

-            else

-                mdat->mirtab[i].succ++;

-

-            if (broken == 2)

-            {

-                mdat->mirtab[i].ignore = 2;

-            }

-            else

-            {

-                /*

-                 * If the total number of failures is less than 3 then never

-                 * mark a permanent failure, in other case use the real status.

-                 */

-                if (mdat->mirtab[i].fail < 3)

-                    mdat->mirtab[i].ignore = 0;

-                else

-                    mdat->mirtab[i].ignore = broken;

-            }

-        }

-    }

-    else

+    if (NULL == mirror)

     {

+        /*

+         * Allocate space in the mirror table for the new mirror IP

+         */

         mdat->mirtab =

-            (struct mirdat_ip *) realloc (mdat->mirtab,

-                                          (mdat->num +

-                                           1) * sizeof (struct mirdat_ip));

+            (struct mirdat_ip *) realloc(mdat->mirtab,

+                                        (mdat->num + 1) * sizeof(struct mirdat_ip));

         if (!mdat->mirtab)

         {

-            logg ("!Can't allocate memory for new element in mdat->mirtab\n");

-            return -1;

+            logg("!Can't allocate memory for new element in mdat->mirtab\n");

+            return FCE_MEM;

         }

-        memset (&mdat->mirtab[mdat->num], 0, sizeof (struct mirdat_ip));

+        memset (&mdat->mirtab[mdat->num], 0, sizeof(struct mirdat_ip));

         if (af == AF_INET)

         {

             mdat->mirtab[mdat->num].ip4 = *ip;

@@ -255,116 +233,163 @@ mirman_update_int (uint32_t * ip, int af, struct mirdat *mdat, uint8_t broken,

         else

         {

             mdat->mirtab[mdat->num].ip4 = 0;

-            memcpy (mdat->mirtab[mdat->num].ip6, ip, 4 * sizeof (uint32_t));

+            memcpy (mdat->mirtab[mdat->num].ip6, ip, 4 * sizeof(uint32_t));

         }

         mdat->mirtab[mdat->num].atime = 0;

-        mdat->mirtab[mdat->num].succ = (succ > 0) ? succ : 0;

-        mdat->mirtab[mdat->num].fail = (fail > 0) ? fail : 0;

-        mdat->mirtab[mdat->num].ignore = (broken == 2) ? 2 : 0;

-        if (!succ && !fail)

-        {

-            if (broken)

-                mdat->mirtab[mdat->num].fail++;

-            else

-                mdat->mirtab[mdat->num].succ++;

-        }

+        mdat->mirtab[mdat->num].succ = 0;

+        mdat->mirtab[mdat->num].fail = 0;

+        mdat->mirtab[mdat->num].ignore = 0;

+

+        mirror = &mdat->mirtab[mdat->num];