Wire dedup into optional packet dump -p

phaag · Jul 5, 2024 · 0659254 · 0659254
1 parent 9562322
commit 0659254
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/src/nfpcapd/packet_bpf.c b/src/nfpcapd/packet_bpf.c
@@ -327,7 +327,14 @@ void __attribute__((noreturn)) * bpf_packet_thread(void *args) {
 
             size_t size = sizeof(struct pcap_sf_pkthdr) + hdr->bh_caplen;
             u_char *data = (u_char *)(p + hdr->bh_hdrlen);
-            if (DoPacketDump) {
+            struct pcap_pkthdr phdr = {//
+                                       .ts.tv_sec = hdr->bh_tstamp.tv_sec,
+                                       .ts.tv_usec = hdr->bh_tstamp.tv_usec,
+                                       .caplen = hdr->bh_caplen,
+                                       .len = hdr->bh_datalen};
+            int ok = ProcessPacket(packetParam, &phdr, data);
+
+            if (DoPacketDump && ok) {
                 if ((packetBuffer->bufferSize + size) > BUFFSIZE) {
                     packetBuffer->timeStamp = 0;
                     dbg_printf("packet_thread() flush buffer - size %zu\n", packetBuffer->bufferSize);
@@ -336,12 +343,7 @@ void __attribute__((noreturn)) * bpf_packet_thread(void *args) {
                 }
                 PcapDump(packetBuffer, hdr, data);
             }
-            struct pcap_pkthdr phdr;
-            phdr.ts.tv_sec = hdr->bh_tstamp.tv_sec;
-            phdr.ts.tv_usec = hdr->bh_tstamp.tv_usec;
-            phdr.caplen = hdr->bh_caplen;
-            phdr.len = hdr->bh_datalen;
-            ProcessPacket(packetParam, &phdr, data);
+
             p += BPF_WORDALIGN(hdr->bh_hdrlen + hdr->bh_caplen);
         }
         done = done || *(packetParam->done);

diff --git a/src/nfpcapd/packet_linux.c b/src/nfpcapd/packet_linux.c
@@ -324,8 +324,16 @@ void __attribute__((noreturn)) * linux_packet_thread(void *args) {
                 t_start = t_packet - (t_packet % t_win);
             }
 
+            struct pcap_pkthdr phdr = {//
+                                       .ts.tv_sec = ppd->tp_sec,
+                                       .ts.tv_usec = ppd->tp_nsec / 1000,
+                                       .caplen = ppd->tp_snaplen,
+                                       .len = ppd->tp_len};
+            void *data = (void *)ppd + ppd->tp_mac;
+            int ok = ProcessPacket(packetParam, &phdr, data);
+
             size_t size = sizeof(struct pcap_sf_pkthdr) + ppd->tp_len;
-            if (DoPacketDump) {
+            if (DoPacketDump && ok) {
                 if ((packetBuffer->bufferSize + size) > BUFFSIZE) {
                     packetBuffer->timeStamp = 0;
                     dbg_printf("packet_thread() flush buffer - size %zu\n", packetBuffer->bufferSize);
@@ -334,13 +342,7 @@ void __attribute__((noreturn)) * linux_packet_thread(void *args) {
                 }
                 PcapDump(packetBuffer, ppd);
             }
-            struct pcap_pkthdr phdr;
-            phdr.ts.tv_sec = ppd->tp_sec;
-            phdr.ts.tv_usec = ppd->tp_nsec / 1000;
-            phdr.caplen = ppd->tp_snaplen;
-            phdr.len = ppd->tp_len;
-            void *data = (void *)ppd + ppd->tp_mac;
-            ProcessPacket(packetParam, &phdr, data);
+
             ppd = (struct tpacket3_hdr *)((uint8_t *)ppd + ppd->tp_next_offset);
         }
         done = done || *(packetParam->done);

diff --git a/src/nfpcapd/packet_pcap.c b/src/nfpcapd/packet_pcap.c
@@ -280,8 +280,9 @@ void __attribute__((noreturn)) * pcap_packet_thread(void *args) {
                     t_start = t_packet - (t_packet % t_win);
                 }
 
+                int ok = ProcessPacket(packetParam, hdr, data);
                 size_t size = sizeof(struct pcap_sf_pkthdr) + hdr->caplen;
-                if (DoPacketDump) {
+                if (DoPacketDump && ok) {
                     if ((packetBuffer->bufferSize + size) > BUFFSIZE) {
                         packetBuffer->timeStamp = 0;
                         dbg_printf("packet_thread() flush buffer - size %zu\n", packetBuffer->bufferSize);
@@ -290,7 +291,6 @@ void __attribute__((noreturn)) * pcap_packet_thread(void *args) {
                     }
                     PcapDump(packetBuffer, hdr, data);
                 }
-                ProcessPacket(packetParam, hdr, data);
             } break;
             case 0: {
                 // live capture idle cycle