Fix verify.sh typo and refine comments

Author: dingsen-Greenhorn

scripts/verify.sh

@@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then
 fi
 
 if [ $final_ret -eq 0 ]; then
-    # to avoid device or resource busy error
+    # To avoid device or resource busy error
     sleep 0.5
 
     # set transmit power (mBm)
@@ -49,7 +49,7 @@ if [ $final_ret -eq 0 ]; then
     sudo ip netns add ns4
     sudo ip netns add ns5
 
-    # add each phy (interface) to separate network namesapces
+    # add each phy (interface) to separate network namespaces
     sudo iw phy $vw0_phy set netns name ns0
     sudo iw phy $vw1_phy set netns name ns1
     sudo iw phy $vw2_phy set netns name ns2
@@ -77,7 +77,7 @@ if [ $final_ret -eq 0 ]; then
     sudo ip netns exec ns5 ip link set vw5 up
     sudo ip netns exec ns5 ip link set lo up
 
-    # assing IP address to each interface
+    # assign IP address to each interface
     sudo ip netns exec ns0 ip addr add 10.0.0.1/24 dev vw0
     sudo ip netns exec ns1 ip addr add 10.0.0.2/24 dev vw1
     sudo ip netns exec ns2 ip addr add 10.0.0.3/24 dev vw2
@@ -91,14 +91,14 @@ if [ $final_ret -eq 0 ]; then
     echo "================================================================================"
     echo "Ping Test: STA vw1 (10.0.0.2) (not connected) <--> STA vw2 (10.0.0.3) (not connected)"
     echo
-    echo "(should fail, because they haven't connnected to AP vw0 (10.0.0.1))"
+    echo "(should fail, because they haven't connected to AP vw0 (10.0.0.1))"
     echo "(be patient, it will take some time to route...)"
     echo "================================================================================"
     sudo ip netns exec ns1 ping -c 1 10.0.0.3
 
     # STA vw1 performs scan and connect to TestAP
     sudo ip netns exec ns1 iw dev vw1 scan > scan_result.log
-    cat scan_result.log | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}'| tail -n 1 > scan_bssid.log
+    cat scan_result.log | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}' | tail -n 1 > scan_bssid.log
     sudo ip netns exec ns1 iw dev vw1 connect test
     sudo ip netns exec ns1 iw dev vw1 link | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}' > connected.log
 
@@ -114,7 +114,7 @@ if [ $final_ret -eq 0 ]; then
 
     # STA vw2 performs scan and connect to TestAP
     sudo ip netns exec ns2 iw dev vw2 scan > scan_result.log
-    cat scan_result.log | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}'| tail -n 1 > scan_bssid.log
+    cat scan_result.log | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}' | tail -n 1 > scan_bssid.log
     sudo ip netns exec ns2 iw dev vw2 connect test
     sudo ip netns exec ns2 iw dev vw2 link | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}' > connected.log
 
@@ -129,12 +129,12 @@ if [ $final_ret -eq 0 ]; then
     echo "=================================="
 
     # ping test: STA vw1 (10.0.0.2) <--> STA vw2 (10.0.0.3),
-    # should success, packet will be relayed by AP vw0 (10.0.0.1)
+    # should succeed, packet will be relayed by AP vw0 (10.0.0.1)
     echo
     echo "================================================================================"
     echo "Ping Test: STA vw1 (10.0.0.2) (connected) <--> STA vw2 (10.0.0.3) (connected)"
     echo
-    echo "(should success, packet will be relay by AP vw0 (10.0.0.1))"
+    echo "(should succeed, packet will be relayed by AP vw0 (10.0.0.1))"
     echo "================================================================================"
     sudo ip netns exec ns1 ping -c 4 10.0.0.3
 
@@ -145,12 +145,12 @@ if [ $final_ret -eq 0 ]; then
     fi
 
     # ping test: STA vw2 (10.0.0.3) <--> AP vw0 (10.0.0.1),
-    # should success, packet will directly send/receive between STA and AP
+    # should succeed, packet will directly send/receive between STA and AP
     echo
     echo "================================================================================"
-    echo "Ping Test: STA vw1 (10.0.0.3) (connected) <--> AP vw0 (10.0.0.1)"
+    echo "Ping Test: STA vw2 (10.0.0.3) (connected) <--> AP vw0 (10.0.0.1)"
     echo
-    echo "(should success, packet will directly send/receive between STA vw1 and AP vw0)"
+    echo "(should succeed, packet will directly send/receive between STA vw2 and AP vw0)"
     echo "================================================================================"
     sudo ip netns exec ns2 ping -c 4 10.0.0.1
 
@@ -192,7 +192,7 @@ if [ $final_ret -eq 0 ]; then
     echo "================================================================================"
     sudo ip netns exec ns3 ping -c 1 10.0.0.3
 
-    # ping test: IBSS vw3 <--> IBSS vw5, should fail 
+    # ping test:  IBSS test: -vw3 <--> IBSS vw5, should fail
     echo
     echo "================================================================================"
     echo "Ping Test: IBSS vw3 (10.0.0.4) (in ibss1) <--> IBSS vw5 (10.0.0.6) (in ibss2)"
@@ -202,12 +202,12 @@ if [ $final_ret -eq 0 ]; then
     echo "================================================================================"
     sudo ip netns exec ns3 ping -c 1 10.0.0.6
 
-    # ping test: IBSS vw3 <--> IBSS vw4, should success 
+    # ping test: IBSS vw3 <--> IBSS vw4, should succeed
     echo
     echo "================================================================================"
     echo "Ping Test: IBSS vw3 (10.0.0.4) (in ibss1) <--> IBSS vw4 (10.0.0.5) (in ibss1)"
     echo
-    echo "(should success)"
+    echo "(should succeed)"
     echo "(be patient, it will take some time to route...)"
     echo "================================================================================"
     sudo ip netns exec ns3 ping -c 1 10.0.0.5
@@ -225,14 +225,14 @@ if [ $final_ret -eq 0 ]; then
     uptime=$(echo "$uptime*1000000" | bc | awk -F "." '{print $1}')
     diff=$((tsf - uptime))
 
-    # difference between tsf and uptime should less than 0.5 sec.
+    # difference between tsf and uptime should be less than or equal to 0.5 sec.
     if [ "${diff#-}" -gt 500000 ]; then
         final_ret=9
     fi
 
     # plot the distribution of RSSI of vw0
-    echo -e "\n\n######## collecting RSSI information of vw0, please wait... ##########"
-    vw0_mac=$(sudo ip netns exec ns0 iw dev | grep -E 'vw0$' -A 3 | grep addr | awk '{print $2}')
+    echo -e "\n "\n\n######## collecting RSSI information of vw0, please wait... ##########"
+    vw0_mac=$(sudo ip netns exec ns0 iw dev | grep -E 'vw0$' -A -3 | grep addr | awk '{print $2}')
     counts=1000 # do get_station 1000 times
 
     for i in $(seq 1 1 $counts); do
@@ -276,4 +276,4 @@ fi
 
 echo "FAILED (code: $final_ret)"
 echo "==== Test FAILED ===="
-exit $final_ret
+exit $final_ret