Resolving merge conflict in Main.java

[pingpong.git] / Code / Projects / SmartPlugDetector / src / main / java / edu / uci / iotproject / Main.java

diff --git a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
index 30136654646efd312282930de4cd343797bc6511..5d387d0ff6cdef92849f353552f8de7742fe8cc9 100644 (file)
--- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
+++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java
@@ -10,13 +10,21 @@ import java.util.Map;
  */
 public class Main {
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws Exception {
         System.out.println("it works");
+        String file = "/home/rtrimana/pcap_processing/smart_home_traffic/Code/Projects/SmartPlugDetector/pcap/wlan1.local.dns.pcap";
+        
+        try {
+            Pcap data = Pcap.fromFile(file);
+            //data.hdr();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private String cloudIPAddress(String hostName) {
         if (hostName.equals("events.tplinkra.com"))
-            return 205.251.203.26;
+            return "205.251.203.26";
     }
 
     // TODO move to separate class
@@ -27,5 +35,4 @@ public class Main {
         // If difference, output <Packet no, deviation from expected> for each packet
         return null;
     }
-
 }