Resolving merge conflict in 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 c66d94ec17110138dfecc5348f46bbab64878bdc..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
@@ -1,5 +1,8 @@
 package edu.uci.iotproject;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Entry point of the application.
  *
@@ -18,4 +21,18 @@ public class Main {
             e.printStackTrace();
         }
     }
+
+    private String cloudIPAddress(String hostName) {
+        if (hostName.equals("events.tplinkra.com"))
+            return "205.251.203.26";
+    }
+
+    // TODO move to separate class
+    // Add parameter that is the trace to be analyzed (most like the pcap library's representation of a flow)
+    public String findPattern(Map<String, List<Integer>> hostnameToPacketLengths, String smartPlugIp) {
+
+        // No difference, output "Complete match"
+        // If difference, output <Packet no, deviation from expected> for each packet
+        return null;
+    }
 }