From 74dbefe16190b71a517c6169233e039945cf03a1 Mon Sep 17 00:00:00 2001 From: Janus Varmarken Date: Tue, 27 Nov 2018 22:57:26 -0800 Subject: [PATCH] IMPORTANT BUGFIX: consider FULL range of local IPs when determining clietnIsSrc in TcpReassembler --- .../src/main/java/edu/uci/iotproject/TcpReassembler.java | 2 +- 1 file changed, 1 insertion(+), 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 8c91c82..f97ef47 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 @@ -228,7 +228,7 @@ public class TcpReassembler implements PacketListener { // network, but that obviously won't be a useful strategy for an observer at the WAN port. String srcIp = pcapPacket.get(IpV4Packet.class).getHeader().getSrcAddr().getHostAddress(); // TODO: REPLACE THE ROUTER'S IP WITH A PARAMETER!!! - boolean clientIsSrc = srcIp.startsWith("10.0.1.") || srcIp.startsWith("192.168.1.") || srcIp.equals("128.195.205.105"); + boolean clientIsSrc = srcIp.startsWith("10.") || srcIp.startsWith("192.168.") || srcIp.equals("128.195.205.105"); conv = Conversation.fromPcapPacket(pcapPacket, clientIsSrc); } mOpenConversations.put(conv, conv); -- 2.34.1