From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 13 Dec 2005 10:22:27 +0000 (-0500)
Subject: more full_recvbuf cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=456f0d517fa15ce1dfce17b9367faecf24f71cf4;p=thirdparty%2Fntp.git

more full_recvbuf cleanup

bk: 439ea0e3lQi7UjfCUdqzvyXFp7Xvjw
---

diff --git a/libntp/recvbuff.c b/libntp/recvbuff.c
index 5d0a7ba618..965246324d 100644
--- a/libntp/recvbuff.c
+++ b/libntp/recvbuff.c
@@ -185,6 +185,8 @@ get_full_recv_buffer(void)
 	}
 	else
 	{
+		if (full_recvbufs)
+		    msyslog(LOG_ERR, "get_full_recv_buffer: full_list is empty but full_recvbufs is %lu!", full_recvbufs);
 		/*
 		 * Make sure we reset the full count to 0
 		 */
diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 4474c0d4e0..992e4c6946 100644
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -936,18 +936,17 @@ getgroup:
 
 #endif /* HAVE_IO_COMPLETION_PORT */
 
-		if (full_recvbuffs())
+		while (full_recvbuffs())
 		{
 			/*
 			 * Call the data procedure to handle each received
 			 * packet.
 			 */
 			rbuf = get_full_recv_buffer();
-			while (rbuf != NULL)
+			if (rbuf != NULL)	/* This should always be true */
 			{
 				(rbuf->receiver)(rbuf);
 				freerecvbuf(rbuf);
-				rbuf = get_full_recv_buffer();
 			}
 		}