Browse code

Fix for freshclam retry feature.

Micah Snyder authored on 2019/05/22 06:40:45
Showing 2 changed files
... ...
@@ -632,7 +632,6 @@ fc_error_t fc_update_database(
632 632
                 case FC_EMIRRORNOTSYNC: {
633 633
                     if (attempt < g_maxAttempts) {
634 634
                         logg("Trying again in 5 secs...\n");
635
-                        attempt++;
636 635
                         sleep(5);
637 636
                     } else {
638 637
                         logg("Giving up on %s...\n", serverList[i]);
... ...
@@ -642,6 +641,7 @@ fc_error_t fc_update_database(
642 642
                             goto done;
643 643
                         }
644 644
                     }
645
+                    break;
645 646
                 }
646 647
                 default: {
647 648
                     logg("!Unexpected error when attempting to update database: %s\n", database);
... ...
@@ -790,13 +790,13 @@ fc_error_t fc_download_url_database(
790 790
             case FC_EFAILEDGET: {
791 791
                 if (attempt < g_maxAttempts) {
792 792
                     logg("Trying again in 5 secs...\n");
793
-                    attempt++;
794 793
                     sleep(5);
795 794
                 } else {
796 795
                     logg("Update failed for custom database URL: %s\n", urlDatabase);
797 796
                     status = ret;
798 797
                     goto done;
799 798
                 }
799
+                break;
800 800
             }
801 801
             default: {
802 802
                 logg("Unexpected error when attempting to update from custom database URL: %s\n", urlDatabase);
... ...
@@ -599,7 +599,7 @@ static fc_error_t remote_cvdhead(
599 599
             logg("%c Message: %s%s", logerr ? '!' : '^', errbuf, ((errbuf[len - 1] != '\n') ? "\n" : ""));
600 600
         else
601 601
             logg("%c Message: %s\n", logerr ? '!' : '^', curl_easy_strerror(curl_ret));
602
-        status = FC_EDBDIRACCESS;
602
+        status = FC_ECONNECTION;
603 603
         goto done;
604 604
     }
605 605
 
... ...
@@ -822,7 +822,7 @@ static fc_error_t downloadFile(
822 822
             logg("%c Message: %s%s", logerr ? '!' : '^', errbuf, ((errbuf[len - 1] != '\n') ? "\n" : ""));
823 823
         else
824 824
             logg("%c Message: %s\n", logerr ? '!' : '^', curl_easy_strerror(curl_ret));
825
-        status = FC_EDBDIRACCESS;
825
+        status = FC_ECONNECTION;
826 826
         goto done;
827 827
     }
828 828