TNG: Fixed prerequisite check in inverse DV test case script. Fixed execution of not existing script in netjail teardown script.

2 files changed, 5 insertions, 2 deletions

diff --git a/contrib/netjail/netjail_stop.sh b/contrib/netjail/netjail_stop.sh
index 55bcf2a5e..8f6c07f50 100755
--- a/contrib/netjail/netjail_stop.sh
+++ b/contrib/netjail/netjail_stop.sh
@@ -45,7 +45,10 @@ for N in $(seq $GLOBAL_N); do
 
     if [ -d /tmp/netjail_scripts ]
     then
-        ip netns exec ${ROUTERS[$N]} ./${R_SCRIPT[$N]} ${ROUTER_NETS[$N]} 0
+        if [ "" != "${R_SCRIPT[$N]}" ]
+        then
+            ip netns exec ${ROUTERS[$N]} ./${R_SCRIPT[$N]} ${ROUTERS[$N]} 0 $PREFIX
+        fi    
         rm -rf /tmp/netjail_scripts
     fi
 
diff --git a/src/transport/test_transport_simple_send_dv_inverse.sh b/src/transport/test_transport_simple_send_dv_inverse.sh
index 6a89f7397..cf7b863a0 100755
--- a/src/transport/test_transport_simple_send_dv_inverse.sh
+++ b/src/transport/test_transport_simple_send_dv_inverse.sh
@@ -3,7 +3,7 @@ if ! [ -d "/run/netns" ]; then
     echo You have to create the directory /run/netns.
 fi
 if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
-  if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" == 1 ]; then
+  if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then
     echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
     exit 78
   fi