|
 |
2b78f7 |
diff -up ntp-4.2.6p3/ntpd/ntp_io.c.bcast ntp-4.2.6p3/ntpd/ntp_io.c
|
|
|
2b78f7 |
--- ntp-4.2.6p3/ntpd/ntp_io.c.bcast 2010-12-25 10:40:36.000000000 +0100
|
|
|
2b78f7 |
+++ ntp-4.2.6p3/ntpd/ntp_io.c 2011-01-05 17:46:13.820049150 +0100
|
|
|
2b78f7 |
@@ -151,6 +151,8 @@ int ninterfaces; /* Total number of in
|
|
|
2b78f7 |
|
|
|
2b78f7 |
int disable_dynamic_updates; /* scan interfaces once only */
|
|
|
2b78f7 |
|
|
|
2b78f7 |
+static int pktinfo_status = 0; /* is IP_PKTINFO on wildipv4 iface enabled? */
|
|
|
2b78f7 |
+
|
|
|
2b78f7 |
#ifdef REFCLOCK
|
|
|
2b78f7 |
/*
|
|
|
2b78f7 |
* Refclock stuff. We keep a chain of structures with data concerning
|
|
|
2b78f7 |
@@ -2254,6 +2256,17 @@ set_reuseaddr(
|
|
|
2b78f7 |
#endif /* ! SO_EXCLUSIVEADDRUSE */
|
|
|
2b78f7 |
}
|
|
|
2b78f7 |
|
|
|
2b78f7 |
+static void
|
|
|
2b78f7 |
+set_pktinfo(int flag)
|
|
|
2b78f7 |
+{
|
|
|
2b78f7 |
+ if (wildipv4 == NULL)
|
|
|
2b78f7 |
+ return;
|
|
|
2b78f7 |
+ if (setsockopt(wildipv4->fd, SOL_IP, IP_PKTINFO, &flag, sizeof (flag))) {
|
|
|
2b78f7 |
+ msyslog(LOG_ERR, "set_pktinfo: setsockopt(IP_PKTINFO, %s) failed: %m", flag ? "on" : "off");
|
|
|
2b78f7 |
+ } else
|
|
|
2b78f7 |
+ pktinfo_status = flag;
|
|
|
2b78f7 |
+}
|
|
|
2b78f7 |
+
|
|
|
2b78f7 |
/*
|
|
|
2b78f7 |
* This is just a wrapper around an internal function so we can
|
|
|
2b78f7 |
* make other changes as necessary later on
|
|
|
2b78f7 |
@@ -2659,6 +2672,7 @@ io_setbclient(void)
|
|
|
2b78f7 |
}
|
|
|
2b78f7 |
}
|
|
|
2b78f7 |
set_reuseaddr(0);
|
|
|
2b78f7 |
+ set_pktinfo(1);
|
|
|
2b78f7 |
if (nif > 0)
|
|
|
2b78f7 |
DPRINTF(1, ("io_setbclient: Opened broadcast clients\n"));
|
|
|
2b78f7 |
else if (!nif)
|
|
|
2b78f7 |
@@ -2685,6 +2699,7 @@ io_unsetbclient(void)
|
|
|
2b78f7 |
continue;
|
|
|
2b78f7 |
socket_broadcast_disable(ep, &ep->sin);
|
|
|
2b78f7 |
}
|
|
|
2b78f7 |
+ set_pktinfo(0);
|
|
|
2b78f7 |
}
|
|
|
2b78f7 |
|
|
|
2b78f7 |
/*
|
|
|
2b78f7 |
@@ -3392,7 +3407,8 @@ read_network_packet(
|
|
|
2b78f7 |
#ifdef HAVE_TIMESTAMP
|
|
|
2b78f7 |
struct msghdr msghdr;
|
|
|
2b78f7 |
struct iovec iovec;
|
|
|
2b78f7 |
- char control[TIMESTAMP_CTLMSGBUF_SIZE];
|
|
|
2b78f7 |
+ char control[sizeof (struct cmsghdr) * 2 + sizeof (struct timeval) +
|
|
|
2b78f7 |
+ sizeof (struct in_pktinfo) + 32];
|
|
|
2b78f7 |
#endif
|
|
|
2b78f7 |
|
|
|
2b78f7 |
/*
|
|
|
2b78f7 |
@@ -3403,7 +3419,7 @@ read_network_packet(
|
|
|
2b78f7 |
*/
|
|
|
2b78f7 |
|
|
|
2b78f7 |
rb = get_free_recv_buffer();
|
|
|
2b78f7 |
- if (NULL == rb || itf->ignore_packets) {
|
|
|
2b78f7 |
+ if (NULL == rb || (itf->ignore_packets && !(pktinfo_status && itf == wildipv4))) {
|
|
|
2b78f7 |
char buf[RX_BUFF_SIZE];
|
|
|
2b78f7 |
sockaddr_u from;
|
|
|
2b78f7 |
|
|
|
2b78f7 |
@@ -3463,6 +3479,27 @@ read_network_packet(
|
|
|
2b78f7 |
return (buflen);
|
|
|
2b78f7 |
}
|
|
|
2b78f7 |
|
|
|
2b78f7 |
+ if (pktinfo_status && itf->ignore_packets && itf == wildipv4) {
|
|
|
2b78f7 |
+ /* check for broadcast on 255.255.255.255, exception allowed on wildipv4 */
|
|
|
2b78f7 |
+ struct cmsghdr *cmsg;
|
|
|
2b78f7 |
+ struct in_pktinfo *pktinfo = NULL;
|
|
|
2b78f7 |
+
|
|
|
2b78f7 |
+ if ((cmsg = CMSG_FIRSTHDR(&msghdr)))
|
|
|
2b78f7 |
+ do {
|
|
|
2b78f7 |
+ if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_PKTINFO)
|
|
|
2b78f7 |
+ pktinfo = (struct in_pktinfo *) CMSG_DATA(cmsg);
|
|
|
2b78f7 |
+ } while ((cmsg = CMSG_NXTHDR(&msghdr, cmsg)));
|
|
|
2b78f7 |
+ if (pktinfo && pktinfo->ipi_addr.s_addr == INADDR_BROADCAST) {
|
|
|
2b78f7 |
+ DPRINTF(4, ("INADDR_BROADCAST\n"));
|
|
|
2b78f7 |
+ } else {
|
|
|
2b78f7 |
+ DPRINTF(4, ("%s on (%lu) fd=%d from %s\n", "ignore",
|
|
|
2b78f7 |
+ free_recvbuffs(), fd, stoa(&rb->recv_srcadr)));
|
|
|
2b78f7 |
+ packets_ignored++;
|
|
|
2b78f7 |
+ freerecvbuf(rb);
|
|
|
2b78f7 |
+ return (buflen);
|
|
|
2b78f7 |
+ }
|
|
|
2b78f7 |
+ }
|
|
|
2b78f7 |
+
|
|
|
2b78f7 |
DPRINTF(3, ("read_network_packet: fd=%d length %d from %s\n",
|
|
|
2b78f7 |
fd, buflen, stoa(&rb->recv_srcadr)));
|
|
|
2b78f7 |
|