From 345c032d3f6e80a4a56bb68caadecf54ff500245 Mon Sep 17 00:00:00 2001 From: rtrimana Date: Tue, 15 Jan 2019 11:31:18 -0800 Subject: [PATCH] Adding features to process Blossom sprinkler's data: removing overlapping sequences. --- .../main/java/edu/uci/iotproject/Main.java | 31 +++++----- .../detection/layer3/SignatureDetector.java | 8 +-- .../uci/iotproject/util/PcapPacketUtils.java | 59 ++++++++++++++++--- python_ml/validate-detection.py | 17 ++++-- 4 files changed, 80 insertions(+), 35 deletions(-) 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 81eb3b0..c02ef96 100644 --- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java +++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java @@ -59,8 +59,8 @@ public class Main { // final String inputPcapFile = path + "/experimental_result/standalone/dlink-plug/wlan1/dlink-plug.wlan1.local.pcap"; // final String outputPcapFile = path + "/experimental_result/standalone/dlink-plug/wlan1/dlink-plug-processed.pcap"; // final String triggerTimesFile = path + "/experimental_result/standalone/dlink-plug/timestamps/dlink-plug-nov-7-2018.timestamps"; -// //final String deviceIp = "192.168.1.199"; // .246 == phone; .199 == dlink plug? -// final String deviceIp = "192.168.1.246"; // .246 == phone; .199 == dlink plug? +// final String deviceIp = "192.168.1.199"; // .246 == phone; .199 == dlink plug? +//// final String deviceIp = "192.168.1.246"; // .246 == phone; .199 == dlink plug? // 2) TP-Link July 25 experiment // final String inputPcapFile = path + "/2018-07/tplink/tplink.wlan1.local.pcap"; @@ -71,7 +71,7 @@ public class Main { // final String inputPcapFile = path + "/2018-10/tplink-plug/tplink-plug.wlan1.local.pcap"; // final String outputPcapFile = path + "/2018-10/tplink-plug/tplink-plug-processed.pcap"; // final String triggerTimesFile = path + "/2018-10/tplink-plug/tplink-plug-oct-17-2018.timestamps"; -// final String deviceIp = "192.168.1.246"; // .246 == phone; .159 == tplink plug +// final String deviceIp = "192.168.1.159"; // .246 == phone; .159 == tplink plug // TODO: EXPERIMENT - November 8, 2018 // final String inputPcapFile = path + "/experimental_result/standalone/tplink-plug/wlan1/tplink-plug.wlan1.local.pcap"; // final String outputPcapFile = path + "/experimental_result/standalone/tplink-plug/wlan1/tplink-plug-processed.pcap"; @@ -230,10 +230,10 @@ public class Main { // final String outputPcapFile = path + "/2018-10/blossom-sprinkler/blossom-sprinkler-processed.pcap"; // final String triggerTimesFile = path + "/2018-10/blossom-sprinkler/blossom-sprinkler-nov-2-2018.timestamps"; // final String deviceIp = "192.168.1.229"; // .246 == phone; .229 == sprinkler - // January 9, 11 + // January 9, 11, 13, 14 final String inputPcapFile = path + "/experimental_result/standalone/blossom-sprinkler/wlan1/blossom-sprinkler.wlan1.local.pcap"; final String outputPcapFile = path + "/experimental_result/standalone/blossom-sprinkler/wlan1/blossom-sprinkler-processed.pcap"; - final String triggerTimesFile = path + "/experimental_result/standalone/blossom-sprinkler/timestamps/blossom-sprinkler-standalone-jan-9-2019.timestamps"; + final String triggerTimesFile = path + "/experimental_result/standalone/blossom-sprinkler/timestamps/blossom-sprinkler-standalone-jan-14-2019.timestamps"; // final String triggerTimesFile = path + "/experimental_result/standalone/blossom-sprinkler/timestamps/blossom-sprinkler-standalone-jan-11-2019.timestamps"; final String deviceIp = "192.168.1.246"; // .246 == phone; .229 == sprinkler @@ -471,12 +471,12 @@ public class Main { Stream.concat(Stream.of(onPairs), Stream.of(offPairs)).flatMap(List::stream).forEach(p -> p.setDnsMap(dnsMap)); // Perform clustering on conversation logged as part of all ON events. DBSCANClusterer onClusterer = new DBSCANClusterer<>(10.0, 45); - //DBSCANClusterer onClusterer = new DBSCANClusterer<>(7.0, 45); + //DBSCANClusterer onClusterer = new DBSCANClusterer<>(3, 45); //DBSCANClusterer onClusterer = new DBSCANClusterer<>(10.0, 10); List> onClusters = onClusterer.cluster(onPairs); // Perform clustering on conversation logged as part of all OFF events. DBSCANClusterer offClusterer = new DBSCANClusterer<>(10.0, 45); - //DBSCANClusterer offClusterer = new DBSCANClusterer<>(7.0, 45); + //DBSCANClusterer offClusterer = new DBSCANClusterer<>(3, 45); //DBSCANClusterer offClusterer = new DBSCANClusterer<>(10.0, 10); List> offClusters = offClusterer.cluster(offPairs); // Sort the conversations as reference @@ -500,13 +500,10 @@ public class Main { } // TODO: Merging test ppListOfListListOn = PcapPacketUtils.mergeSignatures(ppListOfListListOn, sortedAllConversation); - ppListOfListListOn = PcapPacketUtils.sortSignatures(ppListOfListListOn); - // TODO: Need to remove sequence numbers 0,1 for Blossom phone side since it is not a good signature! - PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOn, 0); + // TODO: Need to remove sequence 550 567 for Blossom phone side since it is not a good signature (overlap)! PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOn, 1); - // TODO: Need to remove sequence numbers 0 for Blossom device side since it is not a good signature! -// PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOn, 0); -// PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOn, 0); + // TODO: Need to remove sequence 69 296 for Blossom device side since it is not a good signature (overlap)! +// PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOn, 2); // TODO: Need to remove sequence number 2 for ST plug since it is not a good signature! //PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOn, 2); // TODO: Need to remove sequence number 0 for Arlo Camera since it is not a good signature! @@ -514,6 +511,7 @@ public class Main { // TODO: Need to remove sequence number 0 for TP-Link plug since it is not a good signature! // TODO: This sequence actually belongs to the local communication between the plug and the phone //PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOn, 0); + ppListOfListListOn = PcapPacketUtils.sortSignatures(ppListOfListListOn); PcapPacketUtils.printSignatures(ppListOfListListOn); //count = 0; /*for (List> ll : ppListOfListListOn) { @@ -541,10 +539,8 @@ public class Main { } // TODO: Merging test ppListOfListListOff = PcapPacketUtils.mergeSignatures(ppListOfListListOff, sortedAllConversation); - ppListOfListListOff = PcapPacketUtils.sortSignatures(ppListOfListListOff); - // TODO: Need to remove sequence numbers 0,2 for Blossom device side since it is not a good signature! -// PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOff, 0); -// PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOff, 0); + // TODO: Need to remove sequence 69 296 for Blossom device side since it is not a good signature (overlap)! +// PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOff, 3); // TODO: Need to remove sequence number 1 for Nest Thermostat since it is not a good signature! //PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOff, 1); // TODO: Need to remove sequence number 0 for Arlo Camera since it is not a good signature! @@ -554,6 +550,7 @@ public class Main { // TODO: Need to remove sequence number 0 for TP-Link plug since it is not a good signature! // TODO: This sequence actually belongs to the local communication between the plug and the phone //PcapPacketUtils.removeSequenceFromSignature(ppListOfListListOff, 0); + ppListOfListListOff = PcapPacketUtils.sortSignatures(ppListOfListListOff); PcapPacketUtils.printSignatures(ppListOfListListOff); //count = 0; /*for (List> ll : ppListOfListListOff) { diff --git a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/layer3/SignatureDetector.java b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/layer3/SignatureDetector.java index c1a5a9c..b2323d8 100644 --- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/layer3/SignatureDetector.java +++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/layer3/SignatureDetector.java @@ -220,11 +220,11 @@ public class SignatureDetector implements PacketListener, Layer3ClusterMatcher.C final String inputPcapFile = path + "/experimental_result/smarthome/blossom-sprinkler/eth0/blossom-sprinkler.eth0.detection.pcap"; // final String inputPcapFile = path + "/experimental_result/smarthome/blossom-sprinkler/wlan1/blossom-sprinkler.wlan1.detection.pcap"; // Blossom Sprinkler DEVICE signatures - final String onSignatureFile = path + "/experimental_result/standalone/blossom-sprinkler/signatures/blossom-sprinkler-onSignature-device-side.sig"; - final String offSignatureFile = path + "/experimental_result/standalone/blossom-sprinkler/signatures/blossom-sprinkler-offSignature-device-side.sig"; +// final String onSignatureFile = path + "/experimental_result/standalone/blossom-sprinkler/signatures/blossom-sprinkler-onSignature-device-side.sig"; +// final String offSignatureFile = path + "/experimental_result/standalone/blossom-sprinkler/signatures/blossom-sprinkler-offSignature-device-side.sig"; // Blossom Sprinkler PHONE signatures -// final String onSignatureFile = path + "/experimental_result/standalone/blossom-sprinkler/signatures/blossom-sprinkler-onSignature-phone-side.sig"; -// final String offSignatureFile = path + "/experimental_result/standalone/blossom-sprinkler/signatures/blossom-sprinkler-offSignature-phone-side.sig"; + final String onSignatureFile = path + "/experimental_result/standalone/blossom-sprinkler/signatures/blossom-sprinkler-onSignature-phone-side.sig"; + final String offSignatureFile = path + "/experimental_result/standalone/blossom-sprinkler/signatures/blossom-sprinkler-offSignature-phone-side.sig"; // LiFX Bulb experiment // final String inputPcapFile = path + "/training/lifx-bulb/wlan1/lifx-bulb.wlan1.local.pcap"; diff --git a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/util/PcapPacketUtils.java b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/util/PcapPacketUtils.java index cee09fe..bde5ec5 100644 --- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/util/PcapPacketUtils.java +++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/util/PcapPacketUtils.java @@ -319,7 +319,9 @@ public final class PcapPacketUtils { // TODO: This is the simplest solution!!! Might not cover all corner cases. // TODO: Sort the list of lists based on the first packet's timestamps! // Collections.sort(signatures, (p1, p2) -> { -// return p1.get(0).get(0).getTimestamp().compareTo(p2.get(0).get(0).getTimestamp()); +// //return p1.get(0).get(0).getTimestamp().compareTo(p2.get(0).get(0).getTimestamp()); +// int compare = p1.get(0).get(0).getTimestamp().compareTo(p2.get(0).get(0).getTimestamp()); +// return compare; // }); // TODO: The following is a more complete solution that covers corner cases. // Sort the list of lists based on one-to-one comparison between timestamps of signatures on both lists. @@ -339,14 +341,17 @@ public final class PcapPacketUtils { if (Math.abs(timestamp1 - timestamp2) < TriggerTrafficExtractor.INCLUSION_WINDOW_MILLIS) { // If these two are within INCLUSION_WINDOW_MILLIS window then compare! compare = p1.get(count1).get(0).getTimestamp().compareTo(p2.get(count2).get(0).getTimestamp()); - if (comparePrev != 0) { // First time since it is 0 - if (Integer.signum(compare) != Integer.signum(comparePrev)) { - // Throw an exception if the order of the two signatures is not consistent, - // E.g., 111, 222, 333 in one occassion and 222, 333, 111 in the other. -// throw new Error("For some reason, the order of signatures are not always consistent!" + -// "Returning the original data structure of signatures..."); - } - } +// if (comparePrev != 0) { // First time since it is 0 +// if (Integer.signum(compare) != Integer.signum(comparePrev)) { +// // Throw an exception if the order of the two signatures is not consistent, +// // E.g., 111, 222, 333 in one occassion and 222, 333, 111 in the other. +// throw new Error("OVERLAP WARNING: " + "" + +// "Please remove one of the sequences: " + +// p1.get(0).get(0).length() + "... OR " + +// p2.get(0).get(0).length() + "..."); +// } +// } + overlapChecking(compare, comparePrev, p1.get(count1), p2.get(count2)); comparePrev = compare; count1++; count2++; @@ -364,6 +369,42 @@ public final class PcapPacketUtils { return signatures; } + /** + * Checks for overlapping between two packet sequences. + * @param compare Current comparison value between packet sequences p1 and p2 + * @param comparePrev Previous comparison value between packet sequences p1 and p2 + * @param sequence1 The packet sequence ({@link List} of {@link PcapPacket} objects). + * @param sequence2 The packet sequence ({@link List} of {@link PcapPacket} objects). + */ + private static void overlapChecking(int compare, int comparePrev, List sequence1, List sequence2) { + + // Check if p1 occurs before p2 but both have same overlap + if (comparePrev != 0) { // First time since it is 0 + if (Integer.signum(compare) != Integer.signum(comparePrev)) { + // Throw an exception if the order of the two signatures is not consistent, + // E.g., 111, 222, 333 in one occassion and 222, 333, 111 in the other. + throw new Error("OVERLAP WARNING: " + "" + + "Two sequences have some overlap. Please remove one of the sequences: " + + sequence1.get(0).length() + "... OR " + + sequence2.get(0).length() + "..."); + } + } + // Check if p1 is longer than p2 and p2 occurs during the occurrence of p1 + int lastIndexOfSequence1 = sequence1.size() - 1; + int lastIndexOfSequence2 = sequence2.size() - 1; + int compareLast = + sequence1.get(lastIndexOfSequence1).getTimestamp().compareTo(sequence2.get(lastIndexOfSequence2).getTimestamp()); + // Check the signs of compare and compareLast + if ((compare <= 0 && compareLast > 0) || + (compareLast <= 0 && compare > 0)) { + throw new Error("OVERLAP WARNING: " + "" + + "One sequence is in the other. Please remove one of the sequences: " + + sequence1.get(0).length() + "... OR " + + sequence2.get(0).length() + "..."); + } + + } + /** * Gets the {@link IpV4Packet} contained in {@code packet}, or throws a {@link NullPointerException} if * {@code packet} does not contain an {@link IpV4Packet}. diff --git a/python_ml/validate-detection.py b/python_ml/validate-detection.py index 9ddde6c..2d19ed4 100644 --- a/python_ml/validate-detection.py +++ b/python_ml/validate-detection.py @@ -1,5 +1,6 @@ from datetime import datetime + path = "/scratch/July-2018/experimental_result/smarthome/" #path = "/scratch/July-2018/experimental_result/standalone/" # D-Link plug @@ -93,14 +94,20 @@ path = "/scratch/July-2018/experimental_result/smarthome/" #fileDetection = "wemo-insight-plug-smarthome-nov-22-2018.phone.wlan1.detections" # Blossom sprinkler -device = "blossom-sprinkler/self-test" -fileExperiment = "blossom-sprinkler-standalone-jan-9-2019.timestamps" +#device = "blossom-sprinkler/self-test" +#fileExperiment = "blossom-sprinkler-standalone-jan-9-2019.timestamps" +#fileExperiment = "blossom-sprinkler-standalone-jan-11-2019.timestamps" +#fileExperiment = "blossom-sprinkler-standalone-jan-14-2019.timestamps" #fileDetection = "phone-side-detection" #fileDetection = "device-side-detection" device = "blossom-sprinkler/timestamps" -fileExperiment = "blossom-sprinkler-smarthome-jan-10-2019.timestamps" -fileDetection = "blossom-sprinkler-smarthome-jan-10-2019.device.wlan1.detections" -#fileDetection = "blossom-sprinkler-smarthome-jan-10-2019.phone.wlan1.detections" +#fileExperiment = "blossom-sprinkler-smarthome-jan-10-2019.timestamps" +#fileExperiment = "blossom-sprinkler-smarthome-jan-11-2019.timestamps" +fileExperiment = "blossom-sprinkler-smarthome-jan-14-2019.timestamps" +#fileDetection = "blossom-sprinkler-smarthome-jan-10-2019.device.wlan1.detections" +#fileDetection = "blossom-sprinkler-smarthome-jan-11-2019.phone.wlan1.detections" +#fileDetection = "blossom-sprinkler-smarthome-jan-14-2019.device.eth0.detections" +fileDetection = "blossom-sprinkler-smarthome-jan-14-2019.phone.eth0.detections" TIME_WINDOW = 15 # detection/signature window of 15 seconds #NEG_TIME_WINDOW = -15 # detection/signature window of 15 seconds -- 2.34.1