From: rtrimana <rtrimana@uci.edu>
Date: Mon, 16 Dec 2019 21:13:49 +0000 (-0800)
Subject: Testing and fixing YourThings scripts for negative experiments.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2ac73ca7c7283603a60a25742c972fc34685662e;p=pingpong.git

Testing and fixing YourThings scripts for negative experiments.
---

diff --git a/Code/Projects/PacketLevelSignatureExtractor/execute_layer2_yourthings_all_detection.sh b/Code/Projects/PacketLevelSignatureExtractor/execute_layer2_yourthings_all_detection.sh
old mode 100644
new mode 100755
index fc0719c..75ef995
--- a/Code/Projects/PacketLevelSignatureExtractor/execute_layer2_yourthings_all_detection.sh
+++ b/Code/Projects/PacketLevelSignatureExtractor/execute_layer2_yourthings_all_detection.sh
@@ -24,12 +24,12 @@ readonly OUTPUT_DIR
 # Then there are subfolders inside 2018/ such as 2018/03/20/
 for SUBFOLDER1 in $YT_TRACES_DIR/*; do
 	for SUBFOLDER2 in $SUBFOLDER1/*; do
-		for PCAP_FILE in $SUBFOLDER2/*.pcap; do
-				# skip non pcap files
-				[ -e "$PCAP_FILE" ] || continue
-				# make an output sub dir in the base output dir that is the filename minus extension
-				OUTPUT_SUB_DIR=$(basename "$PCAP_FILE" .pcap)
-				./execute_layer2_unb_all_detection.sh $PCAP_FILE $SIGNATURES_BASE_DIR $OUTPUT_DIR/$OUTPUT_SUB_DIR
+		for PCAP_FILE in $SUBFOLDER2/*; do
+            # skip non pcap files
+            [ -e "$PCAP_FILE" ] || continue
+            # make an output sub dir in the base output dir that is the filename minus extension
+            OUTPUT_SUB_DIR=$(basename "$PCAP_FILE" .pcap)
+            ./execute_layer2_unb_all_detection.sh $PCAP_FILE $SIGNATURES_BASE_DIR $OUTPUT_DIR/$OUTPUT_SUB_DIR
 		done
 	done
 done
\ No newline at end of file
diff --git a/Code/Projects/PacketLevelSignatureExtractor/execute_layer3_yourthings_all_detection.sh b/Code/Projects/PacketLevelSignatureExtractor/execute_layer3_yourthings_all_detection.sh
index 15c5c7f..ffead24 100755
--- a/Code/Projects/PacketLevelSignatureExtractor/execute_layer3_yourthings_all_detection.sh
+++ b/Code/Projects/PacketLevelSignatureExtractor/execute_layer3_yourthings_all_detection.sh
@@ -24,12 +24,12 @@ readonly OUTPUT_DIR
 # Then there are subfolders inside 2018/ such as 2018/03/20/
 for SUBFOLDER1 in $YT_TRACES_DIR/*; do
 	for SUBFOLDER2 in $SUBFOLDER1/*; do
-		for PCAP_FILE in $SUBFOLDER2/*.pcap; do
-				# skip non pcap files
-				[ -e "$PCAP_FILE" ] || continue
-				# make an output sub dir in the base output dir that is the filename minus extension
-				OUTPUT_SUB_DIR=$(basename "$PCAP_FILE" .pcap)
-				./execute_layer3_unb_all_detection.sh $PCAP_FILE $SIGNATURES_BASE_DIR $OUTPUT_DIR/$OUTPUT_SUB_DIR
+		for PCAP_FILE in $SUBFOLDER2/*; do
+			# skip non pcap files
+			[ -e "$PCAP_FILE" ] || continue
+			# make an output sub dir in the base output dir that is the filename minus extension
+			OUTPUT_SUB_DIR=$(basename "$PCAP_FILE" .pcap)
+			./execute_layer3_unb_all_detection.sh $PCAP_FILE $SIGNATURES_BASE_DIR $OUTPUT_DIR/$OUTPUT_SUB_DIR
 		done
 	done
 done
\ No newline at end of file