X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Code%2FProjects%2FPacketLevelSignatureExtractor%2Fsrc%2Fmain%2Fjava%2Fedu%2Fuci%2Fiotproject%2Fdetection%2Flayer2%2FLayer2SignatureDetector.java;h=1980348a082a89c56f267b036bdd054e3ace15f1;hb=5466e2845c898f821fd1c8ac622912634b8bb4e1;hp=314ce3f55218b63d6b40440867dd8757b80b38f4;hpb=033d4dc83516afccb2ed9806556e8a39497cb314;p=pingpong.git diff --git a/Code/Projects/PacketLevelSignatureExtractor/src/main/java/edu/uci/iotproject/detection/layer2/Layer2SignatureDetector.java b/Code/Projects/PacketLevelSignatureExtractor/src/main/java/edu/uci/iotproject/detection/layer2/Layer2SignatureDetector.java index 314ce3f..1980348 100644 --- a/Code/Projects/PacketLevelSignatureExtractor/src/main/java/edu/uci/iotproject/detection/layer2/Layer2SignatureDetector.java +++ b/Code/Projects/PacketLevelSignatureExtractor/src/main/java/edu/uci/iotproject/detection/layer2/Layer2SignatureDetector.java @@ -52,12 +52,15 @@ public class Layer2SignatureDetector implements PacketListener, ClusterMatcherOb public static void main(String[] args) throws PcapNativeException, NotOpenException, IOException { // Parse required parameters. -// if (args.length < 7) { - if (args.length < 5) { - String errMsg = String.format("Usage: %s inputPcapFile onAnalysisFile offAnalysisFile onSignatureFile offSignatureFile resultsFile" + + if (args.length < 8) { + String errMsg = String.format("SPECTO version 1.0\n" + + "Copyright (C) 2018-2019 Janus Varmarken and Rahmadi Trimananda.\n" + + "University of California, Irvine.\n" + + "All rights reserved.\n\n" + + "Usage: %s inputPcapFile onAnalysisFile offAnalysisFile onSignatureFile offSignatureFile resultsFile" + "\n inputPcapFile: the target of the detection" + -// "\n onAnalysisFile: the file that contains the ON clusters analysis" + -// "\n offAnalysisFile: the file that contains the OFF clusters analysis" + + "\n onAnalysisFile: the file that contains the ON clusters analysis" + + "\n offAnalysisFile: the file that contains the OFF clusters analysis" + "\n onSignatureFile: the file that contains the ON signature to search for" + "\n offSignatureFile: the file that contains the OFF signature to search for" + "\n resultsFile: where to write the results of the detection" + @@ -88,12 +91,6 @@ public class Layer2SignatureDetector implements PacketListener, ClusterMatcherOb final int signatureDuration = Integer.parseInt(args[6]); final double eps = Double.parseDouble(args[7]); -// final String pcapFile = args[0]; -// final String onSignatureFile = args[1]; -// final String offSignatureFile = args[2]; -// final String resultsFile = args[3]; -// final int signatureDuration = Integer.parseInt(args[4]); - // Parse optional parameters. List> onSignatureMacFilters = null, offSignatureMacFilters = null; final int optParamsStartIdx = 7; @@ -137,6 +134,10 @@ public class Layer2SignatureDetector implements PacketListener, ClusterMatcherOb // Check if we should use range-based matching boolean isRangeBasedForOn = PcapPacketUtils.isRangeBasedMatching(onSignature, eps, offSignature); boolean isRangeBasedForOff = PcapPacketUtils.isRangeBasedMatching(offSignature, eps, onSignature); + // TODO: WE DON'T DO RANGE-BASED FOR NOW BECAUSE THE RESULTS ARE TERRIBLE FOR LAYER 2 MATCHING + // TODO: THIS WOULD ONLY WORK FOR SIGNATURES LONGER THAN 2 PACKETS +// boolean isRangeBasedForOn = false; +// boolean isRangeBasedForOff = false; // Update the signature with ranges if it is range-based if (isRangeBasedForOn) { onSignature = PcapPacketUtils.useRangeBasedMatching(onSignature, onClusterAnalysis); @@ -144,15 +145,11 @@ public class Layer2SignatureDetector implements PacketListener, ClusterMatcherOb if (isRangeBasedForOff) { offSignature = PcapPacketUtils.useRangeBasedMatching(offSignature, offClusterAnalysis); } - // TODO: WE DON'T DO RANGE-BASED FOR NOW BECAUSE THE RESULTS ARE TERRIBLE FOR LAYER 2 MATCHING - // TODO: THIS WOULD ONLY WORK FOR SIGNATURES LONGER THAN 2 PACKETS -// boolean isRangeBasedForOn = false; -// boolean isRangeBasedForOff = false; Layer2SignatureDetector onDetector = onSignatureMacFilters == null ? - new Layer2SignatureDetector(onSignature, isRangeBasedForOn, eps) : + new Layer2SignatureDetector(onSignature, signatureDuration, isRangeBasedForOn, eps) : new Layer2SignatureDetector(onSignature, onSignatureMacFilters, signatureDuration, isRangeBasedForOn, eps); Layer2SignatureDetector offDetector = offSignatureMacFilters == null ? - new Layer2SignatureDetector(offSignature, isRangeBasedForOff, eps) : + new Layer2SignatureDetector(offSignature, signatureDuration, isRangeBasedForOff, eps) : new Layer2SignatureDetector(offSignature, offSignatureMacFilters, signatureDuration, isRangeBasedForOff, eps); final List detectedEvents = new ArrayList<>(); onDetector.addObserver((signature, match) -> { @@ -177,9 +174,9 @@ public class Layer2SignatureDetector implements PacketListener, ClusterMatcherOb // Parse the file reader.readFromHandle(); - String resultOn = "Number of detected events of type " + UserAction.Type.TOGGLE_ON + ": " + + String resultOn = "# Number of detected events of type " + UserAction.Type.TOGGLE_ON + ": " + detectedEvents.stream().filter(ua -> ua.getType() == UserAction.Type.TOGGLE_ON).count(); - String resultOff = "Number of detected events of type " + UserAction.Type.TOGGLE_OFF + ": " + + String resultOff = "# Number of detected events of type " + UserAction.Type.TOGGLE_OFF + ": " + detectedEvents.stream().filter(ua -> ua.getType() == UserAction.Type.TOGGLE_OFF).count(); PrintWriterUtils.println(resultOn, resultsWriter, DUPLICATE_OUTPUT_TO_STD_OUT); PrintWriterUtils.println(resultOff, resultsWriter, DUPLICATE_OUTPUT_TO_STD_OUT); @@ -222,8 +219,8 @@ public class Layer2SignatureDetector implements PacketListener, ClusterMatcherOb private int mInclusionTimeMillis; - public Layer2SignatureDetector(List>> searchedSignature, boolean isRangeBased, double eps) { - this(searchedSignature, null, 0, isRangeBased, eps); + public Layer2SignatureDetector(List>> searchedSignature, int signatureDuration, boolean isRangeBased, double eps) { + this(searchedSignature, null, signatureDuration, isRangeBased, eps); } public Layer2SignatureDetector(List>> searchedSignature, List> cluster = mSignature.get(i); Layer2ClusterMatcher clusterMatcher = flowFilters == null ? - new Layer2ClusterMatcher(cluster, isRangeBased, eps) : - new Layer2ClusterMatcher(cluster, flowFilters.get(i), isRangeBased, eps); + new Layer2ClusterMatcher(cluster, inclusionTimeMillis, isRangeBased, eps) : + new Layer2ClusterMatcher(cluster, flowFilters.get(i), inclusionTimeMillis, isRangeBased, eps); clusterMatcher.addObserver(this); clusterMatchers.add(clusterMatcher); }