Adjustments for the addition of eth1 for SmartThings plug

diff --git a/base_gexf_generator.py b/base_gexf_generator.py
index 34c063136736d70bc2ab09698e18af877e935ad2..ad677eccdd2882fd3c9b1258674f02d16bf1b45c 100644 (file)
--- a/base_gexf_generator.py
+++ b/base_gexf_generator.py
@@ -254,7 +254,7 @@ def parse_json(file_path):
     # Create an exclusion list
     exc_list = create_device_list(EXCLUSION_MAC_LIST)
     # First parse the file once, constructing a map that contains information about individual devices' DNS resolutions.
     # Create an exclusion list
     exc_list = create_device_list(EXCLUSION_MAC_LIST)
     # First parse the file once, constructing a map that contains information about individual devices' DNS resolutions.

-    device_dns_mappings = parser.parse_dns.parse_json_dns(file_path) # "./json/eth1.dump.json"
+    device_dns_mappings = parser.parse_dns.parse_json_dns(file_path)

     # Init empty graph
     G = nx.DiGraph()
     # Mapping from edge to a set of protocols
     # Init empty graph
     G = nx.DiGraph()
     # Mapping from edge to a set of protocols


@@ -262,6 +262,7 @@ def parse_json(file_path):
     # Mapping from edge to traffic volume
     edge_to_vol = dict()
     # Parse file again, this time constructing a graph of device<->server and device<->device communication.
     # Mapping from edge to traffic volume
     edge_to_vol = dict()
     # Parse file again, this time constructing a graph of device<->server and device<->device communication.

+    i = 0

     with open(file_path) as jf:
         # Read JSON; data becomes reference to root JSON object (or in our case json array)
         data = json.load(jf)
     with open(file_path) as jf:
         # Read JSON; data becomes reference to root JSON object (or in our case json array)
         data = json.load(jf)

diff --git a/plot_scripts/plot_ts_graph_smartthings-plug b/plot_scripts/plot_ts_graph_smartthings-plug
index 56e298f76900ebf5d98fcd89aa72345a038179be..cea559fd7cc5c041bd6c2b1050616f589ea320e5 100644 (file)
--- a/plot_scripts/plot_ts_graph_smartthings-plug
+++ b/plot_scripts/plot_ts_graph_smartthings-plug
@@ -27,42 +27,56 @@ set yrange [0:]
 # ***************** #
 # SmartThings Plug switch local
 # eth0
 # ***************** #
 # SmartThings Plug switch local
 # eth0

-set output './result/smartthings-plug_switch_eth_timestamp_local_incoming.png'
+set output './result/smartthings-plug_switch_eth0_timestamp_local_incoming.png'

 set title "SmartThings Plug Switch Incoming Local Traffic (eth0)"
 set title "SmartThings Plug Switch Incoming Local Traffic (eth0)"

-plot "./result/smartthings-plug_switch_eth_local_incoming.dat" using 1:2 with lines
-set output './result/smartthings-plug_switch_eth_timestamp_local_outgoing.png'
+plot "./result/smartthings-plug_switch_eth0_local_incoming.dat" using 1:2 with lines
+set output './result/smartthings-plug_switch_eth0_timestamp_local_outgoing.png'

 set title "SmartThings Plug Switch Outgoing Local Traffic (eth0)"
 set title "SmartThings Plug Switch Outgoing Local Traffic (eth0)"

-plot "./result/smartthings-plug_switch_eth_local_outgoing.dat" using 1:2 with lines
+plot "./result/smartthings-plug_switch_eth0_local_outgoing.dat" using 1:2 with lines
+# eth1
+set output './result/smartthings-plug_switch_eth1_timestamp_local_incoming.png'
+set title "SmartThings Plug Switch Incoming Local Traffic (eth1)"
+plot "./result/smartthings-plug_switch_eth1_local_incoming.dat" using 1:2 with lines
+set output './result/smartthings-plug_switch_eth1_timestamp_local_outgoing.png'
+set title "SmartThings Plug Switch Outgoing Local Traffic (eth1)"
+plot "./result/smartthings-plug_switch_eth1_local_outgoing.dat" using 1:2 with lines

 # wlan1
 # wlan1

-#set output './result/smartthings-plug_switch_wlan_timestamp_local_incoming.png'
+#set output './result/smartthings-plug_switch_wlan1_timestamp_local_incoming.png'

 #set title "SmartThings Plug Switch Incoming Local Traffic (wlan1)"
 #set title "SmartThings Plug Switch Incoming Local Traffic (wlan1)"

-#plot "./result/smartthings-plug_switch_wlan_local_incoming.dat" using 1:2 with lines
-set output './result/smartthings-plug_switch_wlan_timestamp_local_outgoing.png'
+#plot "./result/smartthings-plug_switch_wlan1_local_incoming.dat" using 1:2 with lines
+set output './result/smartthings-plug_switch_wlan1_timestamp_local_outgoing.png'

 set title "SmartThings Plug Switch Outgoing Local Traffic (wlan1)"
 set title "SmartThings Plug Switch Outgoing Local Traffic (wlan1)"

-plot "./result/smartthings-plug_switch_wlan_local_outgoing.dat" using 1:2 with lines
+plot "./result/smartthings-plug_switch_wlan1_local_outgoing.dat" using 1:2 with lines

 
 # SmartThings Plug switch remote
 # eth0
 
 # SmartThings Plug switch remote
 # eth0

-set output './result/smartthings-plug_switch_eth_timestamp_remote_incoming.png'
+set output './result/smartthings-plug_switch_eth0_timestamp_remote_incoming.png'

 set title "SmartThings Plug Switch Incoming Remote Traffic (eth0)"
 set title "SmartThings Plug Switch Incoming Remote Traffic (eth0)"

-plot "./result/smartthings-plug_switch_eth_remote_incoming.dat" using 1:2 with lines
-set output './result/smartthings-plug_switch_eth_timestamp_remote_outgoing.png'
+plot "./result/smartthings-plug_switch_eth0_remote_incoming.dat" using 1:2 with lines
+set output './result/smartthings-plug_switch_eth0_timestamp_remote_outgoing.png'

 set title "SmartThings Plug Switch Outgoing Remote Traffic (eth0)"
 set title "SmartThings Plug Switch Outgoing Remote Traffic (eth0)"

-plot "./result/smartthings-plug_switch_eth_remote_outgoing.dat" using 1:2 with lines
+plot "./result/smartthings-plug_switch_eth0_remote_outgoing.dat" using 1:2 with lines
+# eth1
+set output './result/smartthings-plug_switch_eth1_timestamp_remote_incoming.png'
+set title "SmartThings Plug Switch Incoming Remote Traffic (eth1)"
+plot "./result/smartthings-plug_switch_eth1_remote_incoming.dat" using 1:2 with lines
+set output './result/smartthings-plug_switch_eth1_timestamp_remote_outgoing.png'
+set title "SmartThings Plug Switch Outgoing Remote Traffic (eth1)"
+plot "./result/smartthings-plug_switch_eth1_remote_outgoing.dat" using 1:2 with lines

 # wlan1
 # wlan1

-#set output './result/smartthings-plug_switch_wlan_timestamp_remote_incoming.png'
+#set output './result/smartthings-plug_switch_wlan1_timestamp_remote_incoming.png'

 #set title "SmartThings Plug Switch Incoming Remote Traffic (wlan1)"
 #set title "SmartThings Plug Switch Incoming Remote Traffic (wlan1)"

-#plot "./result/smartthings-plug_switch_wlan_remote_incoming.dat" using 1:2 with lines
-set output './result/smartthings-plug_switch_wlan_timestamp_remote_outgoing.png'
-set title "SmartThings Plug Switch Outgoing Remote Traffic (wlan1)"
-plot "./result/smartthings-plug_switch_wlan_remote_outgoing.dat" using 1:2 with lines
+#plot "./result/smartthings-plug_switch_wlan1_remote_incoming.dat" using 1:2 with lines
+#set output './result/smartthings-plug_switch_wlan1_timestamp_remote_outgoing.png'
+#set title "SmartThings Plug Switch Outgoing Remote Traffic (wlan1)"
+#plot "./result/smartthings-plug_switch_wlan1_remote_outgoing.dat" using 1:2 with lines

 
 # SmartThings Plug phone local
 # wlan1
 
 # SmartThings Plug phone local
 # wlan1

-set output './result/smartthings-plug_phone_wlan_timestamp_local_incoming.png'
+set output './result/smartthings-plug_phone_wlan1_timestamp_local_incoming.png'

 set title "SmartThings Plug Phone Incoming Local Traffic (wlan1)"
 set title "SmartThings Plug Phone Incoming Local Traffic (wlan1)"

-plot "./result/smartthings-plug_phone_wlan_local_incoming.dat" using 1:2 with lines
-set output './result/smartthings-plug_phone_wlan_timestamp_local_outgoing.png'
+plot "./result/smartthings-plug_phone_wlan1_local_incoming.dat" using 1:2 with lines
+set output './result/smartthings-plug_phone_wlan1_timestamp_local_outgoing.png'

 set title "SmartThings Plug Phone Outgoing Local Traffic (wlan1)"
 set title "SmartThings Plug Phone Outgoing Local Traffic (wlan1)"

-plot "./result/smartthings-plug_phone_wlan_local_outgoing.dat" using 1:2 with lines
+plot "./result/smartthings-plug_phone_wlan1_local_outgoing.dat" using 1:2 with lines

 
 

diff --git a/plot_scripts/plot_ts_graph_smartthings-plug_combined b/plot_scripts/plot_ts_graph_smartthings-plug_combined
index 6080ddee3b3e0b9d10ac8a5617b5cb15203054af..d8eeddf05170f4878b070ad88ace2fcf722bd0a3 100644 (file)
--- a/plot_scripts/plot_ts_graph_smartthings-plug_combined
+++ b/plot_scripts/plot_ts_graph_smartthings-plug_combined
@@ -26,19 +26,19 @@ set yrange [0:]
 # PER DEVICE SETUP  #
 # ***************** #
 # SmartThings Plug switch local
 # PER DEVICE SETUP  #
 # ***************** #
 # SmartThings Plug switch local

-# wlan1 / eth0
-set output './result/smartthings-plug_switch_wlan_timestamp_local_incoming_combined.png'
-set title "SmartThings Plug Switch Incoming Local Traffic (wlan1/eth0)"
-plot "./result/smartthings-plug_switch_eth_local_incoming.dat" using 1:2 with lines title "eth0", "./result/smartthings-plug_phone_wlan_local_outgoing.dat" using 1:2 with lines title "wlan1-phone-outgoing", "./result/smartthings-plug_phone_wlan_local_incoming.dat" using 1:2 with lines title "wlan1-phone-incoming"
-set output './result/smartthings-plug_switch_wlan_timestamp_local_outgoing_combined.png'
+# wlan1 / eth0 / eth1
+set output './result/smartthings-plug_switch_wlan1_timestamp_local_incoming_combined.png'
+set title "SmartThings Plug Switch Incoming Local Traffic (wlan1/eth0/eth1)"
+plot "./result/smartthings-plug_switch_eth0_local_incoming.dat" using 1:2 with lines title "eth0", "./result/smartthings-plug_switch_eth1_local_incoming.dat" using 1:2 with lines title "eth1", "./result/smartthings-plug_phone_wlan1_local_outgoing.dat" using 1:2 with lines title "wlan1-phone-outgoing", "./result/smartthings-plug_phone_wlan1_local_incoming.dat" using 1:2 with lines title "wlan1-phone-incoming"
+set output './result/smartthings-plug_switch_wlan1_timestamp_local_outgoing_combined.png'

 set title "SmartThings Plug Switch Outgoing Local Traffic (wlan1/eth0)"
 set title "SmartThings Plug Switch Outgoing Local Traffic (wlan1/eth0)"

-plot "./result/smartthings-plug_switch_wlan_local_outgoing.dat" using 1:2 with lines title "wlan1", "./result/smartthings-plug_switch_eth_local_outgoing.dat" using 1:2 with lines title "eth0", "./result/smartthings-plug_phone_wlan_local_outgoing.dat" using 1:2 with lines title "wlan1-phone-outgoing", "./result/smartthings-plug_phone_wlan_local_incoming.dat" using 1:2 with lines title "wlan1-phone-incoming"
+plot "./result/smartthings-plug_switch_wlan1_local_outgoing.dat" using 1:2 with lines title "wlan1", "./result/smartthings-plug_switch_eth0_local_outgoing.dat" using 1:2 with lines title "eth0", "./result/smartthings-plug_switch_eth1_local_outgoing.dat" using 1:2 with lines title "eth1", "./result/smartthings-plug_phone_wlan1_local_outgoing.dat" using 1:2 with lines title "wlan1-phone-outgoing", "./result/smartthings-plug_phone_wlan1_local_incoming.dat" using 1:2 with lines title "wlan1-phone-incoming"

 
 # SmartThings Plug switch remote
 
 # SmartThings Plug switch remote

-# wlan1
-set output './result/smartthings-plug_switch_wlan_timestamp_remote_incoming_combined.png'
-set title "SmartThings Plug Switch Incoming Remote Traffic (wlan1/eth0)"
-plot "./result/smartthings-plug_switch_eth_remote_incoming.dat" using 1:2 with lines title "eth0"
-set output './result/smartthings-plug_switch_wlan_timestamp_remote_outgoing_combined.png'
+# wlan1 / eth0 / eth1
+set output './result/smartthings-plug_switch_wlan1_timestamp_remote_incoming_combined.png'
+set title "SmartThings Plug Switch Incoming Remote Traffic (wlan1/eth0/eth1)"
+plot "./result/smartthings-plug_switch_eth0_remote_incoming.dat" using 1:2 with lines title "eth0", "./result/smartthings-plug_switch_eth1_remote_incoming.dat" using 1:2 with lines title "eth1"
+set output './result/smartthings-plug_switch_wlan1_timestamp_remote_outgoing_combined.png'

 set title "SmartThings Plug Switch Outgoing Remote Traffic (wlan1/eth0)"
 set title "SmartThings Plug Switch Outgoing Remote Traffic (wlan1/eth0)"

-plot "./result/smartthings-plug_switch_wlan_remote_outgoing.dat" using 1:2 with lines title "wlan1", "./result/smartthings-plug_switch_eth_remote_outgoing.dat" using 1:2 with lines title "eth0"
+plot "./result/smartthings-plug_switch_eth0_remote_outgoing.dat" using 1:2 with lines title "eth0", "./result/smartthings-plug_switch_eth1_remote_outgoing.dat" using 1:2 with lines title "eth1"

diff --git a/run.sh b/run.sh
index 5a7cb3bf68b1d2b9676edf6c1e7f752ce7d91be0..3749ed670bb21d73268a7e1d8470eb6e4cd2f5f4 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -30,57 +30,71 @@ PHONE_MAC=a8:96:75:2f:0c:9c
 #PATH_LOCAL=/scratch/traffic_measurements/Switches-Feb2018/wemo-insight/local
 #PATH_REMOTE=/scratch/traffic_measurements/Switches-Feb2018/wemo-insight/remote
 
 #PATH_LOCAL=/scratch/traffic_measurements/Switches-Feb2018/wemo-insight/local
 #PATH_REMOTE=/scratch/traffic_measurements/Switches-Feb2018/wemo-insight/remote
 

-PREFIX=dlink
-DEVICE=DLink_Switch
-DEVICE_MAC=90:8d:78:e3:81:0c
-PATH_SETUP=/scratch/traffic_measurements/Switches-Feb2018/dlink/setup
-PATH_LOCAL=/scratch/traffic_measurements/Switches-Feb2018/dlink/local
-PATH_REMOTE=/scratch/traffic_measurements/Switches-Feb2018/dlink/remote
+#PREFIX=dlink
+#DEVICE=DLink_Switch
+#DEVICE_MAC=90:8d:78:e3:81:0c
+#PATH_SETUP=/scratch/traffic_measurements/Switches-Feb2018/dlink/setup
+#PATH_LOCAL=/scratch/traffic_measurements/Switches-Feb2018/dlink/local
+#PATH_REMOTE=/scratch/traffic_measurements/Switches-Feb2018/dlink/remote

 
 

-#PREFIX=smartthings-plug
-#DEVICE=SmartThings_Plug
-#DEVICE_MAC=d0:52:a8:a3:60:0f
-#PATH_SETUP=/scratch/traffic_measurements/Switches-Feb2018/smartthings/setup
-#PATH_LOCAL=/scratch/traffic_measurements/Switches-Feb2018/smartthings/local
-#PATH_REMOTE=/scratch/traffic_measurements/Switches-Feb2018/smartthings/remote
+PREFIX=smartthings-plug
+DEVICE=SmartThings_Plug
+DEVICE_MAC=d0:52:a8:a3:60:0f
+PATH_SETUP=/scratch/traffic_measurements/Switches-Feb2018/smartthings/setup
+PATH_LOCAL=/scratch/traffic_measurements/Switches-Feb2018/smartthings/local
+PATH_REMOTE=/scratch/traffic_measurements/Switches-Feb2018/smartthings/remote

 
 

-PATH_SETUP_WLAN_JSON=$PREFIX.wlan1.setup.json
-PATH_SETUP_ETH_JSON=$PREFIX.eth0.setup.json
-PATH_LOCAL_WLAN_DNS_JSON=$PREFIX.wlan1.local.dns.json
-PATH_LOCAL_WLAN_JSON=$PREFIX.wlan1.local.json
-PATH_LOCAL_ETH_DNS_JSON=$PREFIX.eth0.local.dns.json
-PATH_LOCAL_ETH_JSON=$PREFIX.eth0.local.json
-PATH_REMOTE_WLAN_DNS_JSON=$PREFIX.wlan1.remote.dns.json
-PATH_REMOTE_WLAN_JSON=$PREFIX.wlan1.remote.json
-PATH_REMOTE_ETH_DNS_JSON=$PREFIX.eth0.remote.dns.json
-PATH_REMOTE_ETH_JSON=$PREFIX.eth0.remote.json
+PATH_SETUP_WLAN1_JSON=$PREFIX.wlan1.setup.json
+PATH_SETUP_ETH0_JSON=$PREFIX.eth0.setup.json
+PATH_SETUP_ETH1_JSON=$PREFIX.eth1.setup.json
+PATH_LOCAL_WLAN1_DNS_JSON=$PREFIX.wlan1.local.dns.json
+PATH_LOCAL_WLAN1_JSON=$PREFIX.wlan1.local.json
+
+PATH_LOCAL_ETH0_DNS_JSON=$PREFIX.eth0.local.dns.json
+PATH_LOCAL_ETH0_JSON=$PREFIX.eth0.local.json
+PATH_LOCAL_ETH1_DNS_JSON=$PREFIX.eth1.local.dns.json
+PATH_LOCAL_ETH1_JSON=$PREFIX.eth1.local.json
+PATH_REMOTE_WLAN1_DNS_JSON=$PREFIX.wlan1.remote.dns.json
+PATH_REMOTE_WLAN1_JSON=$PREFIX.wlan1.remote.json
+PATH_REMOTE_ETH0_DNS_JSON=$PREFIX.eth0.remote.dns.json
+PATH_REMOTE_ETH0_JSON=$PREFIX.eth0.remote.json
+PATH_REMOTE_ETH1_DNS_JSON=$PREFIX.eth1.remote.dns.json
+PATH_REMOTE_ETH1_JSON=$PREFIX.eth1.remote.json

 PATH_GNUPLOT=./plot_scripts/plot_ts_graph_$PREFIX
 PATH_GNUPLOT_COMBINED=./plot_scripts/plot_ts_graph_$PREFIX\_combined
 PATH_DIR_RESULT=result
 PATH_GNUPLOT=./plot_scripts/plot_ts_graph_$PREFIX
 PATH_GNUPLOT_COMBINED=./plot_scripts/plot_ts_graph_$PREFIX\_combined
 PATH_DIR_RESULT=result

-PATH_RESULT_SETUP_WLAN=$PREFIX\_switch_wlan_setup
-PATH_RESULT_SETUP_ETH=$PREFIX\_switch_eth_setup
-PATH_RESULT_LOCAL_WLAN=$PREFIX\_switch_wlan_local
-PATH_RESULT_LOCAL_ETH=$PREFIX\_switch_eth_local
-PATH_RESULT_REMOTE_WLAN=$PREFIX\_switch_wlan_remote
-PATH_RESULT_REMOTE_ETH=$PREFIX\_switch_eth_remote
-PATH_RESULT_PHONE_LOCAL_WLAN=$PREFIX\_phone_wlan_local
-PATH_RESULT_PHONE_REMOTE_WLAN=$PREFIX\_phone_wlan_remote
+PATH_RESULT_SETUP_WLAN1=$PREFIX\_switch_wlan1_setup
+PATH_RESULT_SETUP_ETH1=$PREFIX\_switch_eth1_setup
+PATH_RESULT_SETUP_ETH0=$PREFIX\_switch_eth0_setup
+PATH_RESULT_LOCAL_WLAN1=$PREFIX\_switch_wlan1_local
+PATH_RESULT_LOCAL_ETH1=$PREFIX\_switch_eth1_local
+PATH_RESULT_LOCAL_ETH0=$PREFIX\_switch_eth0_local
+PATH_RESULT_REMOTE_WLAN1=$PREFIX\_switch_wlan1_remote
+PATH_RESULT_REMOTE_ETH1=$PREFIX\_switch_eth1_remote
+PATH_RESULT_REMOTE_ETH0=$PREFIX\_switch_eth0_remote
+PATH_RESULT_PHONE_LOCAL_WLAN1=$PREFIX\_phone_wlan1_local
+PATH_RESULT_PHONE_REMOTE_WLAN1=$PREFIX\_phone_wlan1_remote

 
 

-#python ./base_gexf_generator.py $PATH_SETUP/$PATH_SETUP_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_SETUP_WLAN.gexf
-#python ./base_gexf_generator.py $PATH_SETUP/$PATH_SETUP_ETH_JSON $PATH_DIR_RESULT/$PATH_RESULT_SETUP_ETH.gexf
+#python ./base_gexf_generator.py $PATH_SETUP/$PATH_SETUP_WLAN1_JSON $PATH_DIR_RESULT/$PATH_RESULT_SETUP_WLAN1.gexf
+#python ./base_gexf_generator.py $PATH_SETUP/$PATH_SETUP_ETH0_JSON $PATH_DIR_RESULT/$PATH_RESULT_SETUP_ETH0.gexf
+#python ./base_gexf_generator.py $PATH_SETUP/$PATH_SETUP_ETH1_JSON $PATH_DIR_RESULT/$PATH_RESULT_SETUP_ETH1.gexf

 
 

-python ./base_gexf_generator.py $PATH_LOCAL/$PATH_LOCAL_WLAN_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_WLAN.gexf
-python ./parser/parse_packet_frequency.py $PATH_LOCAL/$PATH_LOCAL_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_WLAN $DEVICE $DEVICE_MAC
-python ./base_gexf_generator.py $PATH_LOCAL/$PATH_LOCAL_ETH_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_ETH.gexf
-python ./parser/parse_packet_frequency.py $PATH_LOCAL/$PATH_LOCAL_ETH_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_ETH $ROUTER $ROUTER_MAC
+#python ./base_gexf_generator.py $PATH_LOCAL/$PATH_LOCAL_WLAN1_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_WLAN1.gexf
+#python ./parser/parse_packet_frequency.py $PATH_LOCAL/$PATH_LOCAL_WLAN1_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_WLAN1 $DEVICE $DEVICE_MAC
+#python ./base_gexf_generator.py $PATH_LOCAL/$PATH_LOCAL_ETH0_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_ETH0.gexf
+#python ./parser/parse_packet_frequency.py $PATH_LOCAL/$PATH_LOCAL_ETH0_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_ETH0 $ROUTER $ROUTER_MAC
+#python ./base_gexf_generator.py $PATH_LOCAL/$PATH_LOCAL_ETH1_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_ETH1.gexf
+#python ./parser/parse_packet_frequency.py $PATH_LOCAL/$PATH_LOCAL_ETH1_JSON $PATH_DIR_RESULT/$PATH_RESULT_LOCAL_ETH1 $DEVICE $DEVICE_MAC

 
 

-python ./base_gexf_generator.py $PATH_REMOTE/$PATH_REMOTE_WLAN_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_WLAN.gexf
-python ./parser/parse_packet_frequency.py $PATH_REMOTE/$PATH_REMOTE_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_WLAN $DEVICE $DEVICE_MAC
-python ./base_gexf_generator.py $PATH_REMOTE/$PATH_REMOTE_ETH_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_ETH.gexf
-python ./parser/parse_packet_frequency.py $PATH_REMOTE/$PATH_REMOTE_ETH_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_ETH $ROUTER $ROUTER_MAC
+#python ./base_gexf_generator.py $PATH_REMOTE/$PATH_REMOTE_WLAN1_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_WLAN1.gexf
+#python ./parser/parse_packet_frequency.py $PATH_REMOTE/$PATH_REMOTE_WLAN1_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_WLAN1 $DEVICE $DEVICE_MAC
+#python ./base_gexf_generator.py $PATH_REMOTE/$PATH_REMOTE_ETH0_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_ETH0.gexf
+#python ./parser/parse_packet_frequency.py $PATH_REMOTE/$PATH_REMOTE_ETH0_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_ETH0 $ROUTER $ROUTER_MAC
+#python ./base_gexf_generator.py $PATH_REMOTE/$PATH_REMOTE_ETH1_DNS_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_ETH1.gexf
+#python ./parser/parse_packet_frequency.py $PATH_REMOTE/$PATH_REMOTE_ETH1_JSON $PATH_DIR_RESULT/$PATH_RESULT_REMOTE_ETH1 $DEVICE $DEVICE_MAC

 
 

-python ./parser/parse_packet_frequency.py $PATH_LOCAL/$PATH_LOCAL_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_PHONE_LOCAL_WLAN $PHONE $PHONE_MAC
-python ./parser/parse_packet_frequency.py $PATH_REMOTE/$PATH_REMOTE_WLAN_JSON $PATH_DIR_RESULT/$PATH_RESULT_PHONE_REMOTE_WLAN $PHONE $PHONE_MAC
+#python ./parser/parse_packet_frequency.py $PATH_LOCAL/$PATH_LOCAL_WLAN1_JSON $PATH_DIR_RESULT/$PATH_RESULT_PHONE_LOCAL_WLAN1 $PHONE $PHONE_MAC
+#python ./parser/parse_packet_frequency.py $PATH_REMOTE/$PATH_REMOTE_WLAN1_JSON $PATH_DIR_RESULT/$PATH_RESULT_PHONE_REMOTE_WLAN1 $PHONE $PHONE_MAC

 
 

-gnuplot $PATH_GNUPLOT
+#gnuplot $PATH_GNUPLOT

 gnuplot $PATH_GNUPLOT_COMBINED
 gnuplot $PATH_GNUPLOT_COMBINED