Merge branch 'master' into pcap-options

[libpcap] / pcap-netfilter-linux.c

diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c
index 17f528fc0783fadb62ed9111d903b12e52870496..33204a54e045bed86b69928f586cfb9c1ca66b10 100644 (file)
--- a/pcap-netfilter-linux.c
+++ b/pcap-netfilter-linux.c
@@ -33,6 +33,7 @@
 #endif
 
 #include "pcap-int.h"
+#include "diag-control.h"
 
 #ifdef NEED_STRERROR_H
 #include "strerror.h"
@@ -135,6 +136,13 @@ netfilter_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_c
                bp = (unsigned char *)handle->buffer;
        } else
                bp = handle->bp;
+
+       /*
+        * Loop through each message.
+        *
+        * This assumes that a single buffer of message will have
+        * <= INT_MAX packets, so the message count doesn't overflow.
+        */
        ep = bp + len;
        while (bp < ep) {
                const struct nlmsghdr *nlh = (const struct nlmsghdr *) bp;
@@ -343,7 +351,9 @@ netfilter_send_config_msg(const pcap_t *handle, uint16_t msg_type, int ack, u_in
        static unsigned int seq_id;
 
        if (!seq_id)
+DIAG_OFF_NARROWING
                seq_id = time(NULL);
+DIAG_ON_NARROWING
        ++seq_id;
 
        nlh->nlmsg_len = NLMSG_LENGTH(sizeof(struct nfgenmsg));