From d03d3a1a326d6ff8636b156e7a81f23099c0420e Mon Sep 17 00:00:00 2001 From: Janus Varmarken Date: Mon, 21 Jan 2019 13:57:23 -0800 Subject: [PATCH 1/1] Remove dlink-siren device side from layer 2 detection and layer 2 detection analysis scripts as it does not have a device side signature. D-link siren device side signature files in experimental_results are legacy files that should not be considered. --- .../execute_layer2_smarthome_all_detection.sh | 8 -------- ...ute_layer2_smarthome_all_detection_results_analysis.sh | 6 ------ 2 files changed, 14 deletions(-) diff --git a/Code/Projects/SmartPlugDetector/execute_layer2_smarthome_all_detection.sh b/Code/Projects/SmartPlugDetector/execute_layer2_smarthome_all_detection.sh index adcf367..4028804 100755 --- a/Code/Projects/SmartPlugDetector/execute_layer2_smarthome_all_detection.sh +++ b/Code/Projects/SmartPlugDetector/execute_layer2_smarthome_all_detection.sh @@ -77,14 +77,6 @@ PROGRAM_ARGS="'$PCAP_FILE' '$ON_SIGNATURE' '$OFF_SIGNATURE' '$RESULTS_FILE'" # ==================================================== D-LINK SIREN ==================================================== PCAP_FILE="$PCAPS_BASE_DIR/dlink-siren/wlan1/dlink-siren.wlan1.detection.pcap" -# DEVICE SIDE -ON_SIGNATURE="$SIGNATURES_BASE_DIR/dlink-siren/signatures/dlink-siren-onSignature-device-side.sig" -OFF_SIGNATURE="$SIGNATURES_BASE_DIR/dlink-siren/signatures/dlink-siren-offSignature-device-side.sig" -RESULTS_FILE="$OUTPUT_DIR/dlink-siren/dlink-siren.wlan1.detection.pcap___device-side.detectionresults" - -PROGRAM_ARGS="'$PCAP_FILE' '$ON_SIGNATURE' '$OFF_SIGNATURE' '$RESULTS_FILE'" -./gradlew run -DmainClass=edu.uci.iotproject.detection.layer2.Layer2SignatureDetector --args="$PROGRAM_ARGS" - # PHONE SIDE ON_SIGNATURE="$SIGNATURES_BASE_DIR/dlink-siren/signatures/dlink-siren-onSignature-phone-side.sig" OFF_SIGNATURE="$SIGNATURES_BASE_DIR/dlink-siren/signatures/dlink-siren-offSignature-phone-side.sig" diff --git a/Code/Projects/SmartPlugDetector/execute_layer2_smarthome_all_detection_results_analysis.sh b/Code/Projects/SmartPlugDetector/execute_layer2_smarthome_all_detection_results_analysis.sh index e2cf70b..7d0689d 100755 --- a/Code/Projects/SmartPlugDetector/execute_layer2_smarthome_all_detection_results_analysis.sh +++ b/Code/Projects/SmartPlugDetector/execute_layer2_smarthome_all_detection_results_analysis.sh @@ -63,12 +63,6 @@ PROGRAM_ARGS="'$TIMESTAMPS_FILE' '$RESULTS_FILE' '$ANALYSIS_RESULTS_FILE'" # ==================================================== D-LINK SIREN ==================================================== TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/dlink-siren/timestamps/dlink-siren-smarthome-nov-10-2018.timestamps" -# DEVICE SIDE -RESULTS_FILE="$RESULTS_BASE_DIR/dlink-siren/dlink-siren.wlan1.detection.pcap___device-side.detectionresults" -ANALYSIS_RESULTS_FILE="$RESULTS_FILE.analysis" -PROGRAM_ARGS="'$TIMESTAMPS_FILE' '$RESULTS_FILE' '$ANALYSIS_RESULTS_FILE'" -./gradlew run -DmainClass=edu.uci.iotproject.evaluation.DetectionResultsAnalyzer --args="$PROGRAM_ARGS" - #PHONE SIDE RESULTS_FILE="$RESULTS_BASE_DIR/dlink-siren/dlink-siren.wlan1.detection.pcap___phone-side.detectionresults" ANALYSIS_RESULTS_FILE="$RESULTS_FILE.analysis" -- 2.34.1