[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 04/07: TNG: miniupnpd only works with public IP addresses.
From: |
gnunet |
Subject: |
[gnunet] 04/07: TNG: miniupnpd only works with public IP addresses. |
Date: |
Wed, 18 Jan 2023 10:50:56 +0100 |
This is an automated email from the git hooks/post-receive script.
t3sserakt pushed a commit to branch master
in repository gnunet.
commit c524f91a6250a2b22da30cd7efbec817c2d8568d
Author: t3sserakt <t3ss@posteo.de>
AuthorDate: Wed Jan 18 10:00:47 2023 +0100
TNG: miniupnpd only works with public IP addresses.
---
contrib/netjail/netjail_start.sh | 13 +++++++++++--
src/testing/gnunet-cmds-helper.c | 12 ++++++++++++
src/testing/testing.c | 12 ++++++++++++
3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/contrib/netjail/netjail_start.sh b/contrib/netjail/netjail_start.sh
index 6036ecbdc..e68745746 100755
--- a/contrib/netjail/netjail_start.sh
+++ b/contrib/netjail/netjail_start.sh
@@ -24,8 +24,17 @@ fi
shift 2
LOCAL_GROUP="192.168.15"
-GLOBAL_GROUP="172.16.150"
-KNOWN_GROUP="172.16.151"
+GLOBAL_GROUP="92.68.150"
+KNOWN_GROUP="92.68.151"
+# Use the IP addresses below instead of the public ones,
+# if the script was not started from within a new namespace
+# created by unshare. The UPNP test case needs public IP
+# addresse for miniupnpd to function.
+# FIXME The ip addresses are used in the c code too. We should
+# introduce a switch indicating if public addresses should be
+# used or not. This info has to be propagated to the c code.
+#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 90b686891..de50aca3a 100644
--- a/src/testing/gnunet-cmds-helper.c
+++ b/src/testing/gnunet-cmds-helper.c
@@ -61,9 +61,21 @@
#define NODE_BASE_IP "192.168.15."
+#define KNOWN_BASE_IP "92.68.151."
+
+#define ROUTER_BASE_IP "92.68.150."
+
+/* Use the IP addresses below instead of the public ones,
+ * if the start script was not started from within a new namespace
+ * created by unshare. The UPNP test case needs public IP
+ * addresse for miniupnpd to function.
+ * FIXME We should introduce a switch indicating if public
+ * addresses should be used or not. This info has to be
+ * propagated from the start script to the c code.
#define KNOWN_BASE_IP "172.16.151."
#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 f2bf68c08..a1161925b 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -43,9 +43,21 @@
#define CONNECT_ADDRESS_TEMPLATE "%s-192.168.15.%u"
+#define ROUTER_CONNECT_ADDRESS_TEMPLATE "%s-92.68.150.%u"
+
+#define KNOWN_CONNECT_ADDRESS_TEMPLATE "%s-92.68.151.%u"
+
+/* Use the IP addresses below instead of the public ones,
+ * if the start script was not started from within a new namespace
+ * created by unshare. The UPNP test case needs public IP
+ * addresse for miniupnpd to function.
+ * FIXME We should introduce a switch indicating if public
+ * addresses should be used or not. This info has to be
+ * propagated from the start script to the c code.
#define ROUTER_CONNECT_ADDRESS_TEMPLATE "%s-172.16.150.%u"
#define KNOWN_CONNECT_ADDRESS_TEMPLATE "%s-172.16.151.%u"
+*/
#define PREFIX_TCP "tcp"
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (6b56928ab -> de50c9a2d), gnunet, 2023/01/18
- [gnunet] 04/07: TNG: miniupnpd only works with public IP addresses.,
gnunet <=
- [gnunet] 02/07: TNG: Added script running miniupnpd on a router node for the nat upnp test case., gnunet, 2023/01/18
- [gnunet] 01/07: TNG: Added topology file for nat upnp test case., gnunet, 2023/01/18
- [gnunet] 05/07: TNG: Changed the format of the interface names to make miniupnpd happy., gnunet, 2023/01/18
- [gnunet] 06/07: TNG: Cleanup after scripts which were running on netjail nodes., gnunet, 2023/01/18
- [gnunet] 07/07: Merge branch 'master' of ssh://git.gnunet.org/gnunet, gnunet, 2023/01/18
- [gnunet] 03/07: TNG: Handing over the global number of the router node to the script running on that node., gnunet, 2023/01/18