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

bk: 469e539435yGPetL3ZI_V8TLS9il0A

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index b82635c59d60358e79b637f3acc6f26ce79f8317..fabd1e2fcad8b80795ee49d5a2eb835b90389fd6 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -2856,7 +2856,6 @@ read_network_packet(SOCKET fd, struct interface *itf, l_fp ts)
        GETSOCKNAME_SOCKLEN_TYPE fromlen;
        int buflen;
        isc_boolean_t ignore_this;
-       isc_boolean_t ignore_later = ISC_FALSE;
        register struct recvbuf *rb;
 #ifdef HAVE_TIMESTAMP
        struct msghdr msghdr;
@@ -2879,14 +2878,8 @@ read_network_packet(SOCKET fd, struct interface *itf, l_fp ts)
         * have read the packet.
         */
        ignore_this = itf->ignore_packets;
-       if (ignore_this == ISC_TRUE && itf->family == AF_INET &&
-           (itf->flags & (INT_BROADCAST | INT_WILDCARD)) &&
-           get_broadcastclient_flag() == ISC_TRUE
-           )
-           ignore_later = ISC_TRUE;
-
-       if (rb == NULL ||
-           (ignore_this == ISC_TRUE && ignore_later == ISC_FALSE)) {
+
+       if (rb == NULL ||(ignore_this == ISC_TRUE)) {
                char buf[RX_BUFF_SIZE];
                struct sockaddr_storage from;
                if (rb != NULL)

diff --git a/ports/winnt/ntpd/ntp_iocompletionport.c b/ports/winnt/ntpd/ntp_iocompletionport.c
index d7371f598a74bcbd179db49ac1ecdca68eba7dab..602990c999825cd01bd28518fe45e965e8faf8f2 100644 (file)
--- a/ports/winnt/ntpd/ntp_iocompletionport.c
+++ b/ports/winnt/ntpd/ntp_iocompletionport.c
@@ -521,26 +521,11 @@ OnSocketRecv(DWORD i, IoCompletionInfo *lpo, DWORD Bytes, int errstatus)
        }
        else 
        {
-               /* 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
-                */
 #ifdef DEBUG
                if(debug > 3 && get_packet_mode(buff) == MODE_BROADCAST)
                        printf("****Accepting Broadcast packet on fd %d from %s\n", buff->fd, stoa(&buff->recv_srcadr));
 #endif
                ignore_this = inter->ignore_packets;
-               if (ignore_this == ISC_TRUE && inter->family == AF_INET &&
-                   (inter->flags & (INT_BROADCAST | INT_WILDCARD)) &&
-                   get_packet_mode(buff) == MODE_BROADCAST &&
-                   get_broadcastclient_flag() == ISC_TRUE
-                   ) {
-                       ignore_this = ISC_FALSE;
-#ifdef DEBUG
-                       if (debug > 1)
-                               printf("****Accepting ignored packet on fd %d from %s\n", buff->fd, stoa(&buff->recv_srcadr));
-#endif
-               }
 #ifdef DEBUG
                else {
                        if (debug > 3)