test everything again... detected error in assert state machine...

0fa51a5f · Pedro Oliveira · 54baf0b5 · 0fa51a5f · 0fa51a5f · 0fa51a5f
Commit 0fa51a5f authored Jul 26, 2018 by Pedro Oliveira
20 changed files
--- a/TestResults/Router1_Router2.pcap
+++ b/TestResults/Router1_Router2.pcap
--- a/TestResults/Router1_Router2_nointerest.pcap
+++ b/TestResults/Router1_Router2_nointerest.pcap
--- a/TestResults/Router1_Router3.pcap
+++ b/TestResults/Router1_Router3.pcap
--- a/TestResults/Router1_Router3_nointerest.pcap
+++ b/TestResults/Router1_Router3_nointerest.pcap
--- a/TestResults/Router1_Router4.pcap
+++ b/TestResults/Router1_Router4.pcap
--- a/TestResults/Router1_Router4_nointerest.pcap
+++ b/TestResults/Router1_Router4_nointerest.pcap
--- a/TestResults/Router1_Source.pcap
+++ b/TestResults/Router1_Source.pcap
--- a/TestResults/Router1_Source_nointerest.pcap
+++ b/TestResults/Router1_Source_nointerest.pcap
--- a/TestResults/Router7_Client0.pcap
+++ b/TestResults/Router7_Client0.pcap
--- a/TestResults/Router7_Client0_nointerest.pcap
+++ b/TestResults/Router7_Client0_nointerest.pcap
--- a/TestResults/Router7_Router2.pcap
+++ b/TestResults/Router7_Router2.pcap
--- a/TestResults/Router7_Router2_nointerest.pcap
+++ b/TestResults/Router7_Router2_nointerest.pcap
--- a/TestResults/Router7_Router5.pcap
+++ b/TestResults/Router7_Router5.pcap
--- a/TestResults/Router7_Router5_nointerest.pcap
+++ b/TestResults/Router7_Router5_nointerest.pcap
--- a/TestResults/Switch.pcap
+++ b/TestResults/Switch.pcap
--- a/TestResults/Switch_nointerest.pcap
+++ b/TestResults/Switch_nointerest.pcap
--- a/TestResults/log.txt
+++ b/TestResults/log.txt
--- a/TestResults/log_no_interest.txt
+++ b/TestResults/log_no_interest.txt
--- a/emulation/router1/root/script.sh
+++ b/emulation/router1/root/script.sh
@@ -7,7 +7,7 @@ cd MulticastRouting
 tcpdump -i eth0 -w /hosthome/Desktop/test_pim/pim/TestResults/Router1_Source.pcap &
 tcpdump -i eth1 -w /hosthome/Desktop/test_pim/pim/TestResults/Router1_Router2.pcap &
 tcpdump -i eth2 -w /hosthome/Desktop/test_pim/pim/TestResults/Router1_Router3.pcap &
-tcpdump -i eth2 -w /hosthome/Desktop/test_pim/pim/TestResults/Router1_Router4.pcap &
+tcpdump -i eth3 -w /hosthome/Desktop/test_pim/pim/TestResults/Router1_Router4.pcap &

 python3 Run.py -stop
 python3 Run.py -start

--- a/emulation/router7/root/script.sh
+++ b/emulation/router7/root/script.sh
@@ -3,9 +3,9 @@ cp -rf /hosthome/Desktop/pim/ MulticastRouting/
 cd MulticastRouting
 #pip-3.2 install --index-url=https://pypi.python.org/simple/ -r requirements.txt

-tcpdump -i eth0 -w /hosthome/Desktop/test_pim/pim/TestResults/Router7_Client0.pcap &
-tcpdump -i eth1 -w /hosthome/Desktop/test_pim/pim/TestResults/Router7_Router2.pcap &
-tcpdump -i eth2 -w /hosthome/Desktop/test_pim/pim/TestResults/Router7_Router5.pcap &
+tcpdump -i eth0 -w /hosthome/Desktop/test_pim/pim/TestResults/Router7_Router5.pcap &
+tcpdump -i eth1 -w /hosthome/Desktop/test_pim/pim/TestResults/Router7_Client0.pcap &
+tcpdump -i eth2 -w /hosthome/Desktop/test_pim/pim/TestResults/Router7_Router2.pcap &