From: Janus Varmarken <varmarken@gmail.com>
Date: Wed, 28 Nov 2018 06:57:26 +0000 (-0800)
Subject: IMPORTANT BUGFIX: consider FULL range of local IPs when determining clietnIsSrc in... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=74dbefe16190b71a517c6169233e039945cf03a1;p=pingpong.git

IMPORTANT BUGFIX: consider FULL range of local IPs when determining clietnIsSrc in TcpReassembler
---

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);