From: Danny Mayer <mayer@ntp.org>
Date: Wed, 18 Jul 2007 19:03:37 +0000 (-0400)
Subject: Undo bug #629 fixes as they cause more problems than were  being solved
X-Git-Tag: NTP_4_2_5P59~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f81148124d02a6b3dd8face1f9dda609c5a5876;p=thirdparty%2Fntp.git

Undo bug #629 fixes as they cause more problems than were  being solved

bk: 469e6409ivvQlvPNBD_ed4IwsXGUkw
---

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index fabd1e2fc..413b5e64e 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -2871,14 +2871,7 @@ read_network_packet(SOCKET fd, struct interface *itf, l_fp ts)
 	 */
 
 	rb = get_free_recv_buffer();
-
-	/* For broadcast packet received on the IPv4 wildcard socket
-	 * we carve out an exception but only if the client has requested
-	 * to receive wildcard sockets. The final check is later when we
-	 * have read the packet.
-	 */
 	ignore_this = itf->ignore_packets;
-
 	if (rb == NULL ||(ignore_this == ISC_TRUE)) {
 		char buf[RX_BUFF_SIZE];
 		struct sockaddr_storage from;
@@ -2942,7 +2935,7 @@ read_network_packet(SOCKET fd, struct interface *itf, l_fp ts)
 	 * Make sure only a valide broadcast packet was received
 	 * on the wildcard address
 	 */
-	if (ignore_later == ISC_TRUE && get_packet_mode(rb) != MODE_BROADCAST) {
+	if (ignore_this == ISC_TRUE) {
 		freerecvbuf(rb);
 		DPRINTF(4, ("%s on (%lu) fd=%d from %s\n",
 			"ignore", free_recvbuffs(), fd, stoa(&rb->recv_srcadr)));