From ef09fd85e67b9b79999f17078bc2442a87170ac3 Mon Sep 17 00:00:00 2001 From: rtrimana Date: Wed, 28 Nov 2018 08:14:54 -0800 Subject: [PATCH] Merging changes. --- .../java/edu/uci/iotproject/detection/SignatureDetector.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/SignatureDetector.java b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/SignatureDetector.java index 22e4964..e6f579c 100644 --- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/SignatureDetector.java +++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/SignatureDetector.java @@ -89,7 +89,7 @@ public class SignatureDetector implements PacketListener, ClusterMatcher.Cluster // final String inputPcapFile = path + "/UNSW/16-09-27.pcap"; // final String inputPcapFile = path + "/UNSW/16-09-29.pcap"; // final String inputPcapFile = path + "/UNSW/16-10-01.pcap"; -// final String inputPcapFile = path + "/UNSW/16-10-06.pcap"; + final String inputPcapFile = path + "/UNSW/16-10-06.pcap"; // TODO: The following one is very long!!! // final String inputPcapFile = path + "/UNSW/16-10-12.pcap"; @@ -283,7 +283,7 @@ public class SignatureDetector implements PacketListener, ClusterMatcher.Cluster // final String inputPcapFile = path + "/experimental_result/standalone/wemo-insight-plug/wlan1/wemo-insight-plug.wlan1.local.pcap"; // final String inputPcapFile = path + "/experimental_result/standalone/wemo-insight-plug/eth0/wemo-insight-plug.eth0.local.pcap"; // TODO: WE HAVE 1 ADDITIONAL EVENT (FROM WEMO PLUG) - final String inputPcapFile = path + "/experimental_result/smarthome/wemo-insight-plug/wlan1/wemo-insight-plug.wlan1.detection.pcap"; +// final String inputPcapFile = path + "/experimental_result/smarthome/wemo-insight-plug/wlan1/wemo-insight-plug.wlan1.detection.pcap"; // final String inputPcapFile = path + "/experimental_result/smarthome/wemo-insight-plug/eth0/wemo-insight-plug.eth0.detection.pcap"; // WeMo Insight Plug PHONE signatures final String onSignatureFile = path + "/experimental_result/standalone/wemo-insight-plug/signatures/wemo-insight-plug-onSignature-phone-side.sig"; -- 2.34.1