From ac8ed0589a15790b4d71d497f0fc3e7842be1ae8 Mon Sep 17 00:00:00 2001 From: garciay Date: Tue, 11 Oct 2016 14:21:07 +0000 Subject: [PATCH] Add capability to capture without PCAP filter --- .../etsi/its/pcapdump/PcapMultiplexer.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/pcapdump/src/org/etsi/its/pcapdump/PcapMultiplexer.java b/tools/pcapdump/src/org/etsi/its/pcapdump/PcapMultiplexer.java index d343bd2a1..eb9631e4e 100644 --- a/tools/pcapdump/src/org/etsi/its/pcapdump/PcapMultiplexer.java +++ b/tools/pcapdump/src/org/etsi/its/pcapdump/PcapMultiplexer.java @@ -101,18 +101,20 @@ public class PcapMultiplexer implements Runnable { } captureThread = new Thread(this); captureThread.start(); - filter = String.format("ether proto 0x%04x", frameType); - System.out.println("New filter: " + filter); + if (frameType != 0) { + filter = String.format("ether proto 0x%04x", frameType); + System.out.println("New filter: " + filter); - // Apply filter - PcapBpfProgram bpfFilter = new PcapBpfProgram(); - int optimize = 0; // 1 means true, 0 means false - int netmask = 0; - int r = pcap.compile(bpfFilter, filter, optimize, netmask); - if (r != Pcap.OK) { - System.out.println("Filter error: " + pcap.getErr()); - } - pcap.setFilter(bpfFilter); + // Apply filter + PcapBpfProgram bpfFilter = new PcapBpfProgram(); + int optimize = 0; // 1 means true, 0 means false + int netmask = 0; + int r = pcap.compile(bpfFilter, filter, optimize, netmask); + if (r != Pcap.OK) { + System.out.println("Filter error: " + pcap.getErr()); + } + pcap.setFilter(bpfFilter); + } // else, no filter dumper = pcap.dumpOpen(client.getFileName()); -- GitLab