From 30345421df8d2165907a2cdf3d4795b94d458ccf Mon Sep 17 00:00:00 2001 From: Janus Varmarken Date: Wed, 26 Sep 2018 12:54:32 -0700 Subject: [PATCH] rename SignatureDetector to ClusterMatcher --- .../{SignatureDetector.java => ClusterMatcher.java} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/{SignatureDetector.java => ClusterMatcher.java} (97%) 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/ClusterMatcher.java similarity index 97% rename from Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/SignatureDetector.java rename to Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/ClusterMatcher.java index cdcad85..027717e 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/ClusterMatcher.java @@ -19,7 +19,7 @@ import static edu.uci.iotproject.util.PcapPacketUtils.*; * @author Janus Varmarken {@literal } * @author Rahmadi Trimananda {@literal } */ -public class SignatureDetector implements PacketListener { +public class ClusterMatcher implements PacketListener { // Test client public static void main(String[] args) throws PcapNativeException, NotOpenException { @@ -30,7 +30,7 @@ public class SignatureDetector implements PacketListener { final String signatureFile = path + "/2018-07/dlink/offSignature1.sig"; List> signature = PrintUtils.serializeClustersFromFile(signatureFile); - SignatureDetector signatureDetector = new SignatureDetector(signature, null, + ClusterMatcher clusterMatcher = new ClusterMatcher(signature, null, (sig, match) -> System.out.println( String.format("[ !!! SIGNATURE DETECTED AT %s !!! ]", match.get(0).getTimestamp().atZone(ZoneId.of("America/Los_Angeles"))) @@ -43,13 +43,13 @@ public class SignatureDetector implements PacketListener { } catch (PcapNativeException pne) { handle = Pcaps.openOffline(inputPcapFile); } - PcapHandleReader reader = new PcapHandleReader(handle, p -> true, signatureDetector); + PcapHandleReader reader = new PcapHandleReader(handle, p -> true, clusterMatcher); reader.readFromHandle(); - signatureDetector.performDetection(); + clusterMatcher.performDetection(); } /** - * The signature that this {@link SignatureDetector} is trying to detect in the observed traffic. + * The signature that this {@link ClusterMatcher} is trying to detect in the observed traffic. */ private final List> mSignature; @@ -70,7 +70,7 @@ public class SignatureDetector implements PacketListener { private final Observer[] mObservers; - public SignatureDetector(List> signature, String routerWanIp, Observer... detectionObservers) { + public ClusterMatcher(List> signature, String routerWanIp, Observer... detectionObservers) { mSignature = Collections.unmodifiableList(Objects.requireNonNull(signature, "signature cannot be null")); mObservers = Objects.requireNonNull(detectionObservers, "detectionObservers cannot be null"); if (mSignature.isEmpty() || mSignature.stream().anyMatch(inner -> inner.isEmpty())) { -- 2.34.1