From 916dcda5a4b0f0b56fa7e9206878000bacca194d Mon Sep 17 00:00:00 2001 From: Janus Varmarken Date: Tue, 9 Oct 2018 10:31:13 -0700 Subject: [PATCH] TcpReassembler: skip non-IPv4 traffic; SignatureDetector: add paths to d-link evaluation experiment --- .../src/main/java/edu/uci/iotproject/TcpReassembler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/TcpReassembler.java b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/TcpReassembler.java index c61223d..70c096a 100644 --- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/TcpReassembler.java +++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/TcpReassembler.java @@ -9,6 +9,7 @@ import java.util.*; /** * Reassembles TCP conversations (streams). + * Note: current version only supports TCP over IPv4. * * @author Janus Varmarken {@literal } * @author Rahmadi Trimananda {@literal } @@ -39,8 +40,9 @@ public class TcpReassembler implements PacketListener { @Override public void gotPacket(PcapPacket pcapPacket) { + IpV4Packet ipPacket = pcapPacket.get(IpV4Packet.class); TcpPacket tcpPacket = pcapPacket.get(TcpPacket.class); - if (tcpPacket == null) { + if (ipPacket == null || tcpPacket == null) { return; } // ... TODO? -- 2.34.1