[gnunet] branch master updated: -testing: only use local IP ranges.

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 2b146d5ec -testing: only use local IP ranges.
2b146d5ec is described below

commit 2b146d5ec020636d48e23daf300589f41cc25839
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Dec 2 20:12:41 2022 +0900

    -testing: only use local IP ranges.
---
 contrib/netjail/netjail_start.sh                       | 4 ++--
 src/testing/gnunet-cmds-helper.c                       | 4 ++--
 src/testing/testing.c                                  | 4 ++--
 src/transport/test_transport_simple_send_dv_inverse.sh | 9 +++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/contrib/netjail/netjail_start.sh b/contrib/netjail/netjail_start.sh
index d03fa1c87..cdd576f57 100755
--- a/contrib/netjail/netjail_start.sh
+++ b/contrib/netjail/netjail_start.sh
@@ -24,8 +24,8 @@ fi
 shift 2
 
 LOCAL_GROUP="192.168.15"
-GLOBAL_GROUP="92.68.150"
-KNOWN_GROUP="92.68.151"
+GLOBAL_GROUP="172.16.150"
+KNOWN_GROUP="172.16.151"
 
 if [ $BROADCAST -eq 0  ]; then
    PORT="60002"
diff --git a/src/testing/gnunet-cmds-helper.c b/src/testing/gnunet-cmds-helper.c
index 8114d156d..b9c3aa507 100644
--- a/src/testing/gnunet-cmds-helper.c
+++ b/src/testing/gnunet-cmds-helper.c
@@ -58,9 +58,9 @@ testing_api_cmd_block_until_all_peers_started.c */
 
 #define NODE_BASE_IP "192.168.15."
 
-#define KNOWN_BASE_IP "92.68.151."
+#define KNOWN_BASE_IP "172.168.151."
 
-#define ROUTER_BASE_IP "92.68.150."
+#define ROUTER_BASE_IP "172.16.150."
 
 struct GNUNET_SCHEDULER_Task *finished_task;
 
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 968499b22..20cf17895 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -40,9 +40,9 @@
 
 #define CONNECT_ADDRESS_TEMPLATE "%s-192.168.15.%u"
 
-#define ROUTER_CONNECT_ADDRESS_TEMPLATE "%s-92.68.150.%u"
+#define ROUTER_CONNECT_ADDRESS_TEMPLATE "%s-172.16.150.%u"
 
-#define KNOWN_CONNECT_ADDRESS_TEMPLATE "%s-92.68.151.%u"
+#define KNOWN_CONNECT_ADDRESS_TEMPLATE "%s-172.16.151.%u"
 
 #define PREFIX_TCP "tcp"
 
diff --git a/src/transport/test_transport_simple_send_dv_inverse.sh 
b/src/transport/test_transport_simple_send_dv_inverse.sh
index eac437cba..6a89f7397 100755
--- a/src/transport/test_transport_simple_send_dv_inverse.sh
+++ b/src/transport/test_transport_simple_send_dv_inverse.sh
@@ -2,10 +2,11 @@
 if ! [ -d "/run/netns" ]; then
     echo You have to create the directory /run/netns.
 fi
-if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" == 1 ]; then
-    # exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs 
/run/netns; valgrind --leak-check=full --track-origins=yes --trace-children=yes 
--trace-children-skip=/usr/bin/awk,/usr/bin/cut,/usr/bin/seq,/sbin/ip/sed/bash  
./test_transport_start_with_config 
test_transport_distance_vector_inverse_topo.conf"
-    exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs 
/run/netns; ./test_transport_start_with_config 
test_transport_distance_vector_inverse_topo.conf"
-else
+if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; 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
 fi
+# exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs 
/run/netns; valgrind --leak-check=full --track-origins=yes --trace-children=yes 
--trace-children-skip=/usr/bin/awk,/usr/bin/cut,/usr/bin/seq,/sbin/ip/sed/bash  
./test_transport_start_with_config 
test_transport_distance_vector_inverse_topo.conf"
+exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; 
./test_transport_start_with_config 
test_transport_distance_vector_inverse_topo.conf"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.