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

+Mon Jan 24 20:12:06 CET 2005 (tk)

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

+  * freshclam: improve error messages (patch by Luca Gibelli <luca*clamav.net>)

+

 Mon Jan 24 17:54:14 CET 2005 (tk)

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

   * clamd/thrmgr.c: unlock mutex if thread->state != POOL_VALID in

@@ -377,15 +377,19 @@ int download(const struct cfgstruct *copt, const struct optstruct *opt)

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

 		if(try < maxattempts - 1) {

-		    mprintf("Trying again...\n");

-		    logg("Trying again...\n");

+		    mprintf("Trying again in 5 secs...\n");

+		    logg("Trying again in 5 secs...\n");

 		    try++;

-		    sleep(1);

+		    sleep(5);

 		    continue;

 		} else {

-		    mprintf("Giving up...\n");

-		    logg("Giving up...\n");

+		    mprintf("Giving up on %s...\n", cpt->strarg);

+		    logg("Giving up on %s...\n", cpt->strarg);

 		    cpt = (struct cfgstruct *) cpt->nextarg;

+		    if(!cpt) {

+			mprintf("@Update failed. Your network may be down or none of the mirrors listed in freshclam.conf is working.\n");

+			logg("ERROR: Update failed. Your network may be down or none of the mirrors listed in freshclam.conf is working.\n");

+		    }

 		    try = 0;

 		}

@@ -274,7 +274,7 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna

 	    hostfd = wwwconnect(hostname, proxy, port, ipaddr);

 	if(hostfd < 0) {

-	    mprintf("@Connection with %s failed.\n", hostname);

+            mprintf("@No servers could be reached. Giving up\n");

 	    if(current)

 		cl_cvdfree(current);

 	    return 52;

@@ -340,9 +340,9 @@ int downloaddb(const char *localname, const char *remotename, const char *hostna

     if(hostfd < 0) {

 	if(ipaddr[0])

-	    mprintf("@Connection with %s failed.\n", ipaddr);

+	    mprintf("Connection with %s failed.\n", ipaddr);

 	else

-	    mprintf("@Connection with %s failed.\n", hostname);

+	    mprintf("Connection with %s failed.\n", hostname);

 	return 52;

     };

@@ -476,7 +476,7 @@ int wwwconnect(const char *server, const char *proxy, int pport, char *ip)

 	name.sin_port = htons(port);

 	if(connect(socketfd, (struct sockaddr *) &name, sizeof(struct sockaddr_in)) == -1) {

-	    mprintf("@Can't connect to port %d of host %s (%s)\n", port, hostpt, ipaddr);

+	    mprintf("Can't connect to port %d of host %s (%s)\n", port, hostpt, ipaddr);

 	    continue;

 	}

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

     }

     close(socketfd);

-    mprintf("@No servers could be reached. Giving up\n");

     return -2;

 }