X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=driver.c;h=c2917268cedfce70fa9d70f085bad27b7f4f201b;hb=da989f7b8294e342572ec5f27f1a6f3f2b1fe56f;hp=cfc4af0f0eeb0d9caa14a26df0c12ac3783b085c;hpb=1cf7053cbc3e3fbacb9770f3532d69192102a842;p=~andy%2Ffetchmail

diff --git a/driver.c b/driver.c
index cfc4af0f..c2917268 100644
--- a/driver.c
+++ b/driver.c
@@ -438,7 +438,8 @@ static int eat_trailer(int sock, struct query *ctl)
 
 static int fetch_messages(int mailserver_socket, struct query *ctl, 
 			  int count, int **msgsizes, int maxfetch,
-			  int *fetches, int *dispatches, int *deletions)
+			  int *fetches, int *dispatches, int *deletions,
+			  int *transient_errors)
 /* fetch messages in lockstep mode */
 {
     flag force_retrieval;
@@ -612,6 +613,7 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
 			     GT_("couldn't fetch headers, message %s@%s:%d (%d octets)\n"),
 			     ctl->remotename, ctl->server.truename, num,
 			     msgsize);
+		(*transient_errors)++;
 		continue;
 	    }
 	    else if (err != 0)
@@ -653,7 +655,10 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
 	    if (err == PS_RETAINED)
 		suppress_forward = suppress_delete = retained = TRUE;
 	    else if (err == PS_TRANSIENT)
+	    {
 		suppress_delete = suppress_forward = TRUE;
+		(*transient_errors)++;
+	    }
 	    else if (err == PS_REFUSED)
 		suppress_forward = TRUE;
 	    else if (err)
@@ -714,7 +719,10 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
 			      len);
 
 		if (err == PS_TRANSIENT)
+		{
 		    suppress_delete = suppress_forward = TRUE;
+		    (*transient_errors)++;
+		}
 		else if (err)
 		    return(err);
 
@@ -940,7 +948,7 @@ static int do_session(
 	/* sigsetjmp returned zero -> normal operation */
 	char buf[MSGBUFSIZE+1], *realhost;
 	int count, newm, bytes;
-	int fetches, dispatches, oldphase;
+	int fetches, dispatches, transient_errors, oldphase;
 	struct idlist *idp;
 
 	/* execute pre-initialization command, if any */
@@ -1098,6 +1106,7 @@ static int do_session(
 		    ctl->sslcommonname : realhost, ctl->server.pollname,
 		    &ctl->remotename) == -1)
 	{
+	    set_timeout(0);
 	    report(stderr, GT_("SSL connection failed.\n"));
 	    err = PS_SOCKET;
 	    goto cleanUp;
@@ -1296,6 +1305,7 @@ is restored."));
 	    pass = 0;
 	    do {
 		dispatches = 0;
+		transient_errors = 0;
 		++pass;
 
 		/* reset timeout, in case we did an IDLE */
@@ -1425,10 +1435,20 @@ is restored."));
 		    err = fetch_messages(mailserver_socket, ctl, 
 					 count, &msgsizes,
 					 maxfetch,
-					 &fetches, &dispatches, &deletions);
+					 &fetches, &dispatches, &deletions,
+					 &transient_errors);
 		    if (err != PS_SUCCESS && err != PS_MAXFETCH)
 			goto cleanUp;
 
+		    if (transient_errors > MAX_TRANSIENT_ERRORS)
+		    {
+			if (outlevel > O_SILENT)
+			{
+			    report(stderr, GT_("Too many mails skipped (%d > %d) due to transient errors for %s\n"),
+				    transient_errors, MAX_TRANSIENT_ERRORS, buf);
+			}
+		    }
+
 		    if (!check_only && ctl->skipped
 			&& run.poll_interval > 0 && !nodetach)
 		    {