From: Janus Varmarken <varmarken@gmail.com>
Date: Fri, 4 May 2018 08:17:16 +0000 (-0700)
Subject: Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=pingpong.git;a=commitdiff_plain;h=09cc04baac94b3eb0acafb1f0d5db2447a54c1f4

Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic

# Conflicts:
#	Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/FlowPatternFinder.java
#	Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
---

09cc04baac94b3eb0acafb1f0d5db2447a54c1f4
diff --cc Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
index 490ad0d,94d957d..239d8c1
--- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
+++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
@@@ -20,7 -25,9 +20,8 @@@ public class Main 
  
  
      public static void main(String[] args) throws PcapNativeException, NotOpenException, EOFException, TimeoutException, UnknownHostException {
-         String fileName = args.length > 0 ? args[0] : "/home/rtrimana/pcap_processing/smart_home_traffic/Code/Projects/SmartPlugDetector/pcap/wlan1.local.remote.dns.pcap";
 -        //final String fileName = "/users/varmarken/Desktop/wlan1.local.dns.pcap";
 -        final String fileName = "/home/rtrimana/pcap_processing/smart_home_traffic/Code/Projects/SmartPlugDetector/pcap/wlan1.local.remote.dns.pcap";
 -        final String trainingFileName = "/home/rtrimana/pcap_processing/smart_home_traffic/Code/Projects/SmartPlugDetector/pcap/TP_LINK_LOCAL_OFF.pcap";
++        final String fileName = args.length > 0 ? args[0] : "/home/rtrimana/pcap_processing/smart_home_traffic/Code/Projects/SmartPlugDetector/pcap/wlan1.local.remote.dns.pcap";
++        final String trainingFileName = "./pcap/TP_LINK_LOCAL_OFF.pcap";
  
          // ====== Debug code ======
          PcapHandle handle;