projects
/
pingpong.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b26baea
)
Updating scripts.
author
rtrimana
<rtrimana@uci.edu>
Thu, 13 Feb 2020 19:19:48 +0000
(11:19 -0800)
committer
rtrimana
<rtrimana@uci.edu>
Thu, 13 Feb 2020 19:19:48 +0000
(11:19 -0800)
Code/Projects/PacketLevelSignatureExtractor/execute_layer2_smarthome_all_detection.sh
patch
|
blob
|
history
Code/Projects/PacketLevelSignatureExtractor/execute_layer2_smarthome_all_detection_results_analysis.sh
patch
|
blob
|
history
Code/Projects/PacketLevelSignatureExtractor/execute_layer3_smarthome_all_detection.sh
patch
|
blob
|
history
Code/Projects/PacketLevelSignatureExtractor/execute_layer3_smarthome_all_detection_results_analysis.sh
patch
|
blob
|
history
Code/Projects/PacketLevelSignatureExtractor/execute_signature_generation.sh
patch
|
blob
|
history
Code/Projects/PacketLevelSignatureExtractor/execute_signature_validation.sh
patch
|
blob
|
history
Code/Projects/PacketLevelSignatureExtractor/execute_signature_validation_results_analysis.sh
patch
|
blob
|
history
diff --git
a/Code/Projects/PacketLevelSignatureExtractor/execute_layer2_smarthome_all_detection.sh
b/Code/Projects/PacketLevelSignatureExtractor/execute_layer2_smarthome_all_detection.sh
index 44346db155758be09acdd534fea9c7c2f35e46f8..10b1ce6e32d4a5ab11ba64736903fab4bcd82d15 100755
(executable)
--- a/
Code/Projects/PacketLevelSignatureExtractor/execute_layer2_smarthome_all_detection.sh
+++ b/
Code/Projects/PacketLevelSignatureExtractor/execute_layer2_smarthome_all_detection.sh
@@
-651,6
+651,7
@@
PROGRAM_ARGS="'$PCAP_FILE' '$ON_ANALYSIS' '$OFF_ANALYSIS' '$ON_SIGNATURE' '$OFF_
# Phone side does not make sense as it is merely a subset of the device side and does not differentiate ONs from OFFs.
# ======================================================================================================================
# Phone side does not make sense as it is merely a subset of the device side and does not differentiate ONs from OFFs.
# ======================================================================================================================
+# TODO: We tested this only for the TP-Link plug on the Mon(IoT)r public dataset
# RELAXED MATCHING
PCAP_FILE="$PCAPS_BASE_DIR/tplink-plug/wlan/tplink-plug.wlan.pcap"
# RELAXED MATCHING
PCAP_FILE="$PCAPS_BASE_DIR/tplink-plug/wlan/tplink-plug.wlan.pcap"
@@
-774,7
+775,7
@@
PROGRAM_ARGS="'$PCAP_FILE' '$ON_ANALYSIS' '$OFF_ANALYSIS' '$ON_SIGNATURE' '$OFF_
#./gradlew run -DmainClass=edu.uci.iotproject.detection.layer2.Layer2SignatureDetector --args="$PROGRAM_ARGS"
# ======================================================================================================================
#./gradlew run -DmainClass=edu.uci.iotproject.detection.layer2.Layer2SignatureDetector --args="$PROGRAM_ARGS"
# ======================================================================================================================
-# TODO:
IMC
DATASET DEVICES
+# TODO:
Mon(IoT)r
DATASET DEVICES
# ================================================= BLINK CAMERA WATCH =================================================
PCAP_FILE="$PCAPS_BASE_DIR/blink-camera/blink-camera-watch/wlan/blink-camera-watch.wlan.pcap"
# ================================================= BLINK CAMERA WATCH =================================================
PCAP_FILE="$PCAPS_BASE_DIR/blink-camera/blink-camera-watch/wlan/blink-camera-watch.wlan.pcap"
diff --git
a/Code/Projects/PacketLevelSignatureExtractor/execute_layer2_smarthome_all_detection_results_analysis.sh
b/Code/Projects/PacketLevelSignatureExtractor/execute_layer2_smarthome_all_detection_results_analysis.sh
index 1ee4d43ce466b939fac8a0779cad5d12a5754ddb..f5a9b3f3549f561a03d0ee77ed80ebfdb31c4a29 100755
(executable)
--- a/
Code/Projects/PacketLevelSignatureExtractor/execute_layer2_smarthome_all_detection_results_analysis.sh
+++ b/
Code/Projects/PacketLevelSignatureExtractor/execute_layer2_smarthome_all_detection_results_analysis.sh
@@
-389,7
+389,7
@@
PROGRAM_ARGS="'$TIMESTAMPS_FILE' '$RESULTS_FILE' '$ANALYSIS_RESULTS_FILE' '$EXAC
# ==================================================== TP-LINK PLUG ====================================================
#TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/tplink-plug/timestamps/tplink-plug-smarthome-nov-9-2018.timestamps"
# ==================================================== TP-LINK PLUG ====================================================
#TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/tplink-plug/timestamps/tplink-plug-smarthome-nov-9-2018.timestamps"
-# TODO: Timestamp file for
IMC
PCAP file
+# TODO: Timestamp file for
Mon(IoT)r
PCAP file
TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/tplink-plug/timestamps/tplink-plug.wlan.timestamps"
# DEVICE SIDE
TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/tplink-plug/timestamps/tplink-plug.wlan.timestamps"
# DEVICE SIDE
@@
-420,7
+420,7
@@
PROGRAM_ARGS="'$TIMESTAMPS_FILE' '$RESULTS_FILE' '$ANALYSIS_RESULTS_FILE' '$EXAC
# ================================================== WEMO INSIGHT PLUG =================================================
# LOCAL
TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/wemo-insight-plug/timestamps/wemo-insight-plug-smarthome-nov-22-2018.timestamps"
# ================================================== WEMO INSIGHT PLUG =================================================
# LOCAL
TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/wemo-insight-plug/timestamps/wemo-insight-plug-smarthome-nov-22-2018.timestamps"
-# TODO: Timestamp file for
IMC
PCAP file
+# TODO: Timestamp file for
Mon(IoT)r
PCAP file
#TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/wemo-insight-plug/timestamps/wemo-insight-plug.timestamps"
# Has no device side signature.
#TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/wemo-insight-plug/timestamps/wemo-insight-plug.timestamps"
# Has no device side signature.
@@
-467,8
+467,8
@@
PROGRAM_ARGS="'$TIMESTAMPS_FILE' '$RESULTS_FILE' '$ANALYSIS_RESULTS_FILE' '$EXAC
#./gradlew run -DmainClass=edu.uci.iotproject.evaluation.DetectionResultsAnalyzer --args="$PROGRAM_ARGS"
# ======================================================================================================================
#./gradlew run -DmainClass=edu.uci.iotproject.evaluation.DetectionResultsAnalyzer --args="$PROGRAM_ARGS"
# ======================================================================================================================
-# TODO:
IMC
DATASET DEVICES
-# TODO: THE LABELS IN THE
IMC
DATASET ARE NOT STRICTLY 15 SECONDS SO WE HAVE TO LOOSEN THE TIMING CONSTRAINT (30 SECONDS)
+# TODO:
Mon(IoT)r
DATASET DEVICES
+# TODO: THE LABELS IN THE
Mon(IoT)r
DATASET ARE NOT STRICTLY 15 SECONDS SO WE HAVE TO LOOSEN THE TIMING CONSTRAINT (30 SECONDS)
# ================================================= BLINK CAMERA WATCH =================================================
TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/blink-camera/blink-camera-watch/timestamps/blink-camera-watch.wlan.timestamps"
# ================================================= BLINK CAMERA WATCH =================================================
TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/blink-camera/blink-camera-watch/timestamps/blink-camera-watch.wlan.timestamps"
diff --git
a/Code/Projects/PacketLevelSignatureExtractor/execute_layer3_smarthome_all_detection.sh
b/Code/Projects/PacketLevelSignatureExtractor/execute_layer3_smarthome_all_detection.sh
index cfcb7d1ed51e480a494723a0f01243907d2eb4b6..5ca89585c9cc7a8c192f32207964294264bc1bf0 100755
(executable)
--- a/
Code/Projects/PacketLevelSignatureExtractor/execute_layer3_smarthome_all_detection.sh
+++ b/
Code/Projects/PacketLevelSignatureExtractor/execute_layer3_smarthome_all_detection.sh
@@
-649,6
+649,7
@@
PROGRAM_ARGS="'$PCAP_FILE' '$ON_ANALYSIS' '$OFF_ANALYSIS' '$ON_SIGNATURE' '$OFF_
# Phone side does not make sense as it is merely a subset of the device side and does not differentiate ONs from OFFs.
# ======================================================================================================================
# Phone side does not make sense as it is merely a subset of the device side and does not differentiate ONs from OFFs.
# ======================================================================================================================
+# TODO: We tested this only for the TP-Link plug on the Mon(IoT)r public dataset
# RELAXED MATCHING
PCAP_FILE="$PCAPS_BASE_DIR/tplink-plug/wan/tplink-plug.wan.pcap"
# RELAXED MATCHING
PCAP_FILE="$PCAPS_BASE_DIR/tplink-plug/wan/tplink-plug.wan.pcap"
@@
-766,7
+767,7
@@
PROGRAM_ARGS="'$PCAP_FILE' '$ON_ANALYSIS' '$OFF_ANALYSIS' '$ON_SIGNATURE' '$OFF_
#./gradlew run -DmainClass=edu.uci.iotproject.detection.layer3.Layer3SignatureDetector --args="$PROGRAM_ARGS"
# ======================================================================================================================
#./gradlew run -DmainClass=edu.uci.iotproject.detection.layer3.Layer3SignatureDetector --args="$PROGRAM_ARGS"
# ======================================================================================================================
-# TODO:
IM
C DATASET DEVICES
+# TODO:
PUBLI
C DATASET DEVICES
# ================================================= BLINK CAMERA WATCH =================================================
PCAP_FILE="$PCAPS_BASE_DIR/blink-camera/blink-camera-watch/wan/blink-camera-watch.wan.pcap"
# ================================================= BLINK CAMERA WATCH =================================================
PCAP_FILE="$PCAPS_BASE_DIR/blink-camera/blink-camera-watch/wan/blink-camera-watch.wan.pcap"
diff --git
a/Code/Projects/PacketLevelSignatureExtractor/execute_layer3_smarthome_all_detection_results_analysis.sh
b/Code/Projects/PacketLevelSignatureExtractor/execute_layer3_smarthome_all_detection_results_analysis.sh
index 46e856a1f33b54b297d94b9d43aaaa40320478c0..5fbe313dc7f375777fba1e6bfb4f76302f730999 100755
(executable)
--- a/
Code/Projects/PacketLevelSignatureExtractor/execute_layer3_smarthome_all_detection_results_analysis.sh
+++ b/
Code/Projects/PacketLevelSignatureExtractor/execute_layer3_smarthome_all_detection_results_analysis.sh
@@
-515,8
+515,8
@@
PROGRAM_ARGS="'$TIMESTAMPS_FILE' '$RESULTS_FILE' '$ANALYSIS_RESULTS_FILE' '$EXAC
#./gradlew run -DmainClass=edu.uci.iotproject.evaluation.DetectionResultsAnalyzer --args="$PROGRAM_ARGS"
# ======================================================================================================================
#./gradlew run -DmainClass=edu.uci.iotproject.evaluation.DetectionResultsAnalyzer --args="$PROGRAM_ARGS"
# ======================================================================================================================
-# TODO:
IMC
DATASET DEVICES
-# TODO: THE LABELS IN THE
IMC
DATASET ARE NOT STRICTLY 15 SECONDS SO WE HAVE TO LOOSEN THE TIMING CONSTRAINT (30 SECONDS)
+# TODO:
Mon(IoT)r
DATASET DEVICES
+# TODO: THE LABELS IN THE
Mon(IoT)r
DATASET ARE NOT STRICTLY 15 SECONDS SO WE HAVE TO LOOSEN THE TIMING CONSTRAINT (30 SECONDS)
# ================================================= BLINK CAMERA WATCH =================================================
TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/blink-camera/blink-camera-watch/timestamps/blink-camera-watch.wan.timestamps"
# ================================================= BLINK CAMERA WATCH =================================================
TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/blink-camera/blink-camera-watch/timestamps/blink-camera-watch.wan.timestamps"
diff --git
a/Code/Projects/PacketLevelSignatureExtractor/execute_signature_generation.sh
b/Code/Projects/PacketLevelSignatureExtractor/execute_signature_generation.sh
index 99d60f98fc8d3d0406b8642dce193fc59a3bc736..51b6f511a28ca81d76303ae27f713eaa22c6504e 100755
(executable)
--- a/
Code/Projects/PacketLevelSignatureExtractor/execute_signature_generation.sh
+++ b/
Code/Projects/PacketLevelSignatureExtractor/execute_signature_generation.sh
@@
-777,6
+777,7
@@
DELETED_SEQUENCES_OFF="-1"
PROGRAM_ARGS="'$INPUT_PCAP' '$OUTPUT_PCAP' '$TIMESTAMP_FILE' '$DEVICE_IP' '$ON_SIGNATURE' '$OFF_SIGNATURE' '$ON_ANALYSIS' '$OFF_ANALYSIS' '$EPSILON' '$DELETED_SEQUENCES_ON' '$DELETED_SEQUENCES_OFF'"
#./gradlew run -DmainClass=edu.uci.iotproject.SignatureGenerator --args="$PROGRAM_ARGS"
PROGRAM_ARGS="'$INPUT_PCAP' '$OUTPUT_PCAP' '$TIMESTAMP_FILE' '$DEVICE_IP' '$ON_SIGNATURE' '$OFF_SIGNATURE' '$ON_ANALYSIS' '$OFF_ANALYSIS' '$EPSILON' '$DELETED_SEQUENCES_ON' '$DELETED_SEQUENCES_OFF'"
#./gradlew run -DmainClass=edu.uci.iotproject.SignatureGenerator --args="$PROGRAM_ARGS"
+
# DEVICE SIDE OUTBOUND (contains only those packets that go through the WAN port, i.e., only the 556, 1293 sequence)
# WAN signature.
ON_SIGNATURE="$OUTPUT_DIR/tplink-plug/signatures/tplink-plug-onSignature-device-side-outbound.sig"
# DEVICE SIDE OUTBOUND (contains only those packets that go through the WAN port, i.e., only the 556, 1293 sequence)
# WAN signature.
ON_SIGNATURE="$OUTPUT_DIR/tplink-plug/signatures/tplink-plug-onSignature-device-side-outbound.sig"
@@
-1012,7
+1013,7
@@
PROGRAM_ARGS="'$INPUT_PCAP' '$OUTPUT_PCAP' '$TIMESTAMP_FILE' '$DEVICE_IP' '$ON_S
#./gradlew run -DmainClass=edu.uci.iotproject.SignatureGenerator --args="$PROGRAM_ARGS"
# ======================================================================================================================
#./gradlew run -DmainClass=edu.uci.iotproject.SignatureGenerator --args="$PROGRAM_ARGS"
# ======================================================================================================================
-# TODO: PUBLIC DATASET
+# TODO:
Mon(IoT)r
PUBLIC DATASET
# ==================================================== TP-LINK PLUG ====================================================
INPUT_PCAP="$SIGNATURES_BASE_DIR/tplink-plug/wlan1/tplink-plug.wlan1.local.pcap"
# ==================================================== TP-LINK PLUG ====================================================
INPUT_PCAP="$SIGNATURES_BASE_DIR/tplink-plug/wlan1/tplink-plug.wlan1.local.pcap"
@@
-1051,7
+1052,7
@@
PROGRAM_ARGS="'$INPUT_PCAP' '$OUTPUT_PCAP' '$TIMESTAMP_FILE' '$DEVICE_IP' '$ON_S
#./gradlew run -DmainClass=edu.uci.iotproject.SignatureGenerator --args="$PROGRAM_ARGS"
# ======================================================================================================================
#./gradlew run -DmainClass=edu.uci.iotproject.SignatureGenerator --args="$PROGRAM_ARGS"
# ======================================================================================================================
-#
IMC
DATASET
+#
Mon(IoT)r
DATASET
# ================================================= BLINK CAMERA WATCH =================================================
INPUT_PCAP="$SIGNATURES_BASE_DIR/blink-camera/blink-camera-watch/wlan1/blink-camera-watch.wlan1.local.pcap"
# ================================================= BLINK CAMERA WATCH =================================================
INPUT_PCAP="$SIGNATURES_BASE_DIR/blink-camera/blink-camera-watch/wlan1/blink-camera-watch.wlan1.local.pcap"
diff --git
a/Code/Projects/PacketLevelSignatureExtractor/execute_signature_validation.sh
b/Code/Projects/PacketLevelSignatureExtractor/execute_signature_validation.sh
index 7b7ba92bdd61f4b517825d9e5d30b407d1303553..6dd58c9cdf6972cfc4b7e6f18f4f3b3e7fa9378b 100755
(executable)
--- a/
Code/Projects/PacketLevelSignatureExtractor/execute_signature_validation.sh
+++ b/
Code/Projects/PacketLevelSignatureExtractor/execute_signature_validation.sh
@@
-853,7
+853,7
@@
PROGRAM_ARGS="'$PCAP_FILE' '$ON_ANALYSIS' '$OFF_ANALYSIS' '$ON_SIGNATURE' '$OFF_
#./gradlew run -DmainClass=edu.uci.iotproject.detection.layer3.Layer3SignatureDetector --args="$PROGRAM_ARGS"
# ======================================================================================================================
#./gradlew run -DmainClass=edu.uci.iotproject.detection.layer3.Layer3SignatureDetector --args="$PROGRAM_ARGS"
# ======================================================================================================================
-# TODO:
IMC
(NEW DEVICE)
+# TODO:
Mon(IoT)r
(NEW DEVICE)
# ================================================= BLINK CAMERA WATCH =================================================
PCAP_FILE="$SIGNATURES_BASE_DIR/blink-camera/blink-camera-watch/wlan1/blink-camera-watch.wlan1.local.pcap"
# ================================================= BLINK CAMERA WATCH =================================================
PCAP_FILE="$SIGNATURES_BASE_DIR/blink-camera/blink-camera-watch/wlan1/blink-camera-watch.wlan1.local.pcap"
diff --git
a/Code/Projects/PacketLevelSignatureExtractor/execute_signature_validation_results_analysis.sh
b/Code/Projects/PacketLevelSignatureExtractor/execute_signature_validation_results_analysis.sh
index 1cd383e4514e5174561f0b7e1cd53673789a1df4..130a7da0286fde5f248ad2690e430141d1874252 100755
(executable)
--- a/
Code/Projects/PacketLevelSignatureExtractor/execute_signature_validation_results_analysis.sh
+++ b/
Code/Projects/PacketLevelSignatureExtractor/execute_signature_validation_results_analysis.sh
@@
-587,7
+587,7
@@
PROGRAM_ARGS="'$TIMESTAMPS_FILE' '$RESULTS_FILE' '$ANALYSIS_RESULTS_FILE' '$EXAC
#./gradlew run -DmainClass=edu.uci.iotproject.evaluation.DetectionResultsAnalyzer --args="$PROGRAM_ARGS"
# ======================================================================================================================
#./gradlew run -DmainClass=edu.uci.iotproject.evaluation.DetectionResultsAnalyzer --args="$PROGRAM_ARGS"
# ======================================================================================================================
-# TODO:
IMC
(NEW DEVICE)
+# TODO:
Mon(IoT)r
(NEW DEVICE)
# ================================================= BLINK CAMERA WATCH =================================================
TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/blink-camera/blink-camera-watch/timestamps/blink-camera-watch-retraining-dec-23-2019.timestamps"
# ================================================= BLINK CAMERA WATCH =================================================
TIMESTAMPS_FILE="$TIMESTAMPS_BASE_DIR/blink-camera/blink-camera-watch/timestamps/blink-camera-watch-retraining-dec-23-2019.timestamps"