[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r15489 - in gnunet: contrib src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r15489 - in gnunet: contrib src/transport |
|
Date: |
Thu, 9 Jun 2011 15:13:05 +0200 |
Author: grothoff
Date: 2011-06-09 15:13:05 +0200 (Thu, 09 Jun 2011)
New Revision: 15489
Modified:
gnunet/contrib/defaults.conf
gnunet/src/transport/plugin_transport_tcp.c
gnunet/src/transport/plugin_transport_udp.c
gnunet/src/transport/test_quota_compliance_tcp_peer1.conf
gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
gnunet/src/transport/test_transport_api_multi_peer1.conf
gnunet/src/transport/test_transport_api_multi_peer2.conf
gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
gnunet/src/transport/test_transport_api_tcp_peer1.conf
gnunet/src/transport/test_transport_api_tcp_peer2.conf
gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
gnunet/src/transport/test_transport_ats_1addr.conf
gnunet/src/transport/test_transport_ats_2addr.conf
gnunet/src/transport/test_transport_ats_4addr.conf
Log:
moving NAT options into their own section
Modified: gnunet/contrib/defaults.conf
===================================================================
--- gnunet/contrib/defaults.conf 2011-06-09 12:02:49 UTC (rev 15488)
+++ gnunet/contrib/defaults.conf 2011-06-09 13:13:05 UTC (rev 15489)
@@ -21,11 +21,7 @@
[client]
HOME = $SERVICEHOME
-[transport-tcp]
-# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
-PORT = 2086
-ADVERTISED_PORT = 2086
-
+[nat]
# Are we behind NAT?
BEHIND_NAT = YES
@@ -54,30 +50,45 @@
# (but use different: this one restricts our bind!)
# BINDTO =
+# Disable IPv6 support
+DISABLEV6 = NO
+
+
+[transport-tcp]
+# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
+PORT = 2086
+ADVERTISED_PORT = 2086
+
TIMEOUT = 300000
-# Disable IPv6 support
-# DISABLEV6 =
+# Allow use of loopback address
+USE_LOCALADDR = NO
+
# ACCEPT_FROM =
# ACCEPT_FROM6 =
# REJECT_FROM =
# REJECT_FROM6 =
+
[transport-udp]
PORT = 2086
-# BEHIND_NAT =
-# BINDTO =
-# ALLOW_NAT =
-# ONLY_NAT_ADDRESSES =
-# INTERNAL_ADDRESS =
-# EXTERNAL_ADDRESS =
+# Allow use of loopback address
+USE_LOCALADDR = NO
+
+
[transport-http]
PORT = 1080
+# Allow use of loopback address
+USE_LOCALADDR = NO
+
[transport-https]
PORT = 4433
+# Allow use of loopback address
+USE_LOCALADDR = NO
+
[transport-wlan]
# Name of the interface in monitor mode (typically monX)
INTERFACE = mon0
Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2011-06-09 12:02:49 UTC (rev
15488)
+++ gnunet/src/transport/plugin_transport_tcp.c 2011-06-09 13:13:05 UTC (rev
15489)
@@ -2278,7 +2278,7 @@
case AF_INET6:
if ( (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *)
addr)->sin6_addr)) ||
(GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_yesno(plugin->env->cfg,
- "transport-tcp",
+ "nat",
"DISABLEV6")) )
{
/* skip link local addresses */
@@ -2829,19 +2829,19 @@
struct GNUNET_TIME_Relative idle_timeout;
behind_nat = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
- "transport-tcp",
+ "nat",
"BEHIND_NAT");
nat_punched = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
- "transport-tcp",
+ "nat",
"NAT_PUNCHED");
enable_nat_client = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
- "transport-tcp",
+ "nat",
"ENABLE_NAT_CLIENT");
enable_nat_server = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
- "transport-tcp",
+ "nat",
"ENABLE_NAT_SERVER");
enable_upnp = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
- "transport-tcp",
+ "nat",
"ENABLE_UPNP");
if ( (GNUNET_YES == enable_nat_server) &&
@@ -2865,11 +2865,11 @@
external_address = NULL;
if (GNUNET_OK ==
GNUNET_CONFIGURATION_have_value (env->cfg,
- "transport-tcp",
+ "nat",
"EXTERNAL_ADDRESS"))
{
(void) GNUNET_CONFIGURATION_get_value_string (env->cfg,
- "transport-tcp",
+ "nat",
"EXTERNAL_ADDRESS",
&external_address);
}
@@ -2902,7 +2902,7 @@
bind_address = NULL;
if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string (env->cfg,
- "transport-tcp",
+ "nat",
"BINDTO",
&bind_address))
{
@@ -2915,11 +2915,11 @@
internal_address = NULL;
if (GNUNET_OK ==
GNUNET_CONFIGURATION_have_value (env->cfg,
- "transport-tcp",
+ "nat",
"INTERNAL_ADDRESS"))
{
(void) GNUNET_CONFIGURATION_get_value_string (env->cfg,
- "transport-tcp",
+ "nat",
"INTERNAL_ADDRESS",
&internal_address);
}
@@ -2975,14 +2975,11 @@
return NULL;
}
- use_localaddresses = GNUNET_NO;
- if (GNUNET_CONFIGURATION_have_value (env->cfg,
- "transport-tcp", "USE_LOCALADDR"))
- {
- use_localaddresses = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
-
"transport-tcp",
-
"USE_LOCALADDR");
- }
+ use_localaddresses = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+ "transport-tcp",
+ "USE_LOCALADDR");
+ if (use_localaddresses == GNUNET_SYSERR)
+ use_localaddresses = GNUNET_NO;
if (aport == 0)
aport = bport;
Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2011-06-09 12:02:49 UTC (rev
15488)
+++ gnunet/src/transport/plugin_transport_udp.c 2011-06-09 13:13:05 UTC (rev
15489)
@@ -1731,7 +1731,7 @@
}
if ( (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, "transport-udp",
+ GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, "nat",
"DISABLEV6")))
{
plugin->udp_sockv6.desc = GNUNET_NETWORK_socket_create (PF_INET6,
SOCK_DGRAM, 0);
@@ -2221,8 +2221,8 @@
struct IPv4UdpAddress v4_address;
if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
- "transport-udp",
- "BEHIND_NAT"))
+ "nat",
+ "BEHIND_NAT"))
{
/* We are behind nat (according to the user) */
if (check_gnunet_nat_binary("gnunet-nat-server") == GNUNET_YES)
@@ -2237,8 +2237,8 @@
behind_nat = GNUNET_NO; /* We are not behind nat! */
if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
- "transport-udp",
- "ALLOW_NAT"))
+ "nat",
+ "ALLOW_NAT"))
{
if (check_gnunet_nat_binary("gnunet-nat-client") == GNUNET_YES)
allow_nat = GNUNET_YES; /* We will try to connect to NAT'd peers */
@@ -2253,8 +2253,8 @@
allow_nat = GNUNET_NO; /* We don't want to try to help NAT'd peers */
if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
- "transport-udp",
-
"ONLY_NAT_ADDRESSES"))
+ "nat",
+ "ONLY_NAT_ADDRESSES"))
only_nat_addresses = GNUNET_YES; /* We will only report our addresses as
NAT'd */
else
only_nat_addresses = GNUNET_NO; /* We will report our addresses as NAT'd
and non-NAT'd */
@@ -2262,7 +2262,7 @@
external_address = NULL;
if (((GNUNET_YES == behind_nat) || (GNUNET_YES == allow_nat)) && (GNUNET_OK
!=
GNUNET_CONFIGURATION_get_value_string (env->cfg,
- "transport-udp",
+ "nat",
"EXTERNAL_ADDRESS",
&external_address)))
{
@@ -2280,13 +2280,13 @@
internal_address = NULL;
if ((GNUNET_YES == behind_nat) && (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (env->cfg,
- "transport-udp",
+ "nat",
"INTERNAL_ADDRESS",
&internal_address)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Require INTERNAL_ADDRESS for service `%s' in
configuration!\n"),
- "transport-udp");
+ _("Require INTERNAL_ADDRESS for service `%s' in
configuration!\n"),
+ "transport-udp");
GNUNET_free_non_null(external_address);
return NULL;
}
@@ -2325,8 +2325,8 @@
"transport-udp", "USE_LOCALADDR"))
{
use_localaddresses = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
-
"transport-udp",
- "USE_LOCALADDR");
+
"transport-udp",
+
"USE_LOCALADDR");
}
plugin = GNUNET_malloc (sizeof (struct Plugin));
Modified: gnunet/src/transport/test_quota_compliance_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer1.conf 2011-06-09
12:02:49 UTC (rev 15488)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer1.conf 2011-06-09
13:13:05 UTC (rev 15489)
@@ -34,16 +34,18 @@
PORT = 4094
[transport-tcp]
-DISABLEV6 = YES
TIMEOUT = 300000
PORT = 4094
+USE_LOCALADDR = YES
+
+[nat]
+DISABLEV6 = YES
BINDTO = 127.0.0.1
ENABLE_UPNP = NO
BEHIND_NAT = NO
ALLOW_NAT = NO
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
[transport]
plugins = tcp
Modified: gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer2.conf 2011-06-09
12:02:49 UTC (rev 15488)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer2.conf 2011-06-09
13:13:05 UTC (rev 15489)
@@ -6,16 +6,18 @@
PORT = 3094
[transport-tcp]
-DISABLEV6 = YES
TIMEOUT = 300000
PORT = 3094
+USE_LOCALADDR = YES
+
+[nat]
+DISABLEV6 = YES
BINDTO = 127.0.0.1
ENABLE_UPNP = NO
BEHIND_NAT = NO
ALLOW_NAT = NO
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
[fs]
AUTOSTART = NO
Modified: gnunet/src/transport/test_transport_api_multi_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer1.conf 2011-06-09
12:02:49 UTC (rev 15488)
+++ gnunet/src/transport/test_transport_api_multi_peer1.conf 2011-06-09
13:13:05 UTC (rev 15489)
@@ -1,13 +1,15 @@
[transport-tcp]
-DISABLEV6 = YES
PORT = 30001
BINDTO = 127.0.0.1
+USE_LOCALADDR = YES
+
+[nat]
+DISABLEV6 = YES
BEHIND_NAT = NO
ALLOW_NAT = NO
ENABLE_UPNP = NO
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
[transport-udp]
PORT = 30001
Modified: gnunet/src/transport/test_transport_api_multi_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer2.conf 2011-06-09
12:02:49 UTC (rev 15488)
+++ gnunet/src/transport/test_transport_api_multi_peer2.conf 2011-06-09
13:13:05 UTC (rev 15489)
@@ -1,13 +1,15 @@
[transport-tcp]
-DISABLEV6 = YES
PORT = 40001
+USE_LOCALADDR = YES
+
+[nat]
BINDTO = 127.0.0.1
+DISABLEV6 = YES
BEHIND_NAT = NO
ALLOW_NAT = NO
ENABLE_UPNP = NO
EXTERNAL_ADDRESS = 127.0.0.1
INTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
[transport-udp]
PORT = 40002
Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf 2011-06-09
12:02:49 UTC (rev 15488)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf 2011-06-09
13:13:05 UTC (rev 15489)
@@ -1,13 +1,15 @@
[transport-tcp]
+PORT = 12368
+USE_LOCALADDR = YES
+
+[nat]
DISABLEV6 = YES
-PORT = 12368
BINDTO = 127.0.0.1
BEHIND_NAT = YES
ENABLE_NAT_SERVER = YES
#NAT_PUNCHED = YES
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
[fs]
AUTOSTART = NO
Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf 2011-06-09
12:02:49 UTC (rev 15488)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf 2011-06-09
13:13:05 UTC (rev 15489)
@@ -1,12 +1,14 @@
[transport-tcp]
-DISABLEV6 = YES
PORT = 23000
+USE_LOCALADDR = YES
+
+[nat]
BINDTO = 127.0.0.1
+DISABLEV6 = YES
BEHIND_NAT = NO
ENABLE_NAT_CLIENT = YES
EXTERNAL_ADDRESS = 127.0.0.1
INTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
[core]
AUTOSTART = NO
Modified: gnunet/src/transport/test_transport_api_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer1.conf 2011-06-09
12:02:49 UTC (rev 15488)
+++ gnunet/src/transport/test_transport_api_tcp_peer1.conf 2011-06-09
13:13:05 UTC (rev 15489)
@@ -1,13 +1,15 @@
[transport-tcp]
+USE_LOCALADDR = YES
+PORT = 12368
+
+[nat]
DISABLEV6 = YES
-PORT = 12368
BINDTO = 127.0.0.1
BEHIND_NAT = NO
#ALLOW_NAT = NO
ENABLE_UPNP = NO
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
[fs]
AUTOSTART = NO
Modified: gnunet/src/transport/test_transport_api_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer2.conf 2011-06-09
12:02:49 UTC (rev 15488)
+++ gnunet/src/transport/test_transport_api_tcp_peer2.conf 2011-06-09
13:13:05 UTC (rev 15489)
@@ -1,13 +1,15 @@
[transport-tcp]
+PORT = 0
+USE_LOCALADDR = YES
+
+[nat]
DISABLEV6 = YES
-PORT = 0
BINDTO = 127.0.0.1
BEHIND_NAT = NO
#ALLOW_NAT = NO
ENABLE_UPNP = NO
EXTERNAL_ADDRESS = 127.0.0.1
INTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
[core]
AUTOSTART = NO
Modified: gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer1.conf 2011-06-09
12:02:49 UTC (rev 15488)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer1.conf 2011-06-09
13:13:05 UTC (rev 15489)
@@ -1,12 +1,14 @@
[transport-udp]
PORT = 12368
+USE_LOCALADDR = YES
+
+[nat]
BEHIND_NAT = YES
BINDTO = 127.0.0.1
ALLOW_NAT = NO
ONLY_NAT_ADDRESSES = YES
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
[fs]
AUTOSTART = NO
Modified: gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer2.conf 2011-06-09
12:02:49 UTC (rev 15488)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer2.conf 2011-06-09
13:13:05 UTC (rev 15489)
@@ -1,11 +1,13 @@
[transport-udp]
PORT = 22368
+USE_LOCALADDR = YES
+
+[nat]
BINDTO = 127.0.0.1
BEHIND_NAT = NO
ALLOW_NAT = YES
EXTERNAL_ADDRESS = 127.0.0.1
INTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
[fs]
AUTOSTART = NO
Modified: gnunet/src/transport/test_transport_ats_1addr.conf
===================================================================
--- gnunet/src/transport/test_transport_ats_1addr.conf 2011-06-09 12:02:49 UTC
(rev 15488)
+++ gnunet/src/transport/test_transport_ats_1addr.conf 2011-06-09 13:13:05 UTC
(rev 15489)
@@ -29,8 +29,8 @@
[statistics]
PORT = 2567
-[transport-tcp]
-#DEBUG=YES
+
+[nat]
DISABLEV6 = YES
BINDTO = 127.0.0.1
BEHIND_NAT = NO
Modified: gnunet/src/transport/test_transport_ats_2addr.conf
===================================================================
--- gnunet/src/transport/test_transport_ats_2addr.conf 2011-06-09 12:02:49 UTC
(rev 15488)
+++ gnunet/src/transport/test_transport_ats_2addr.conf 2011-06-09 13:13:05 UTC
(rev 15489)
@@ -30,10 +30,9 @@
PORT = 2567
[transport-tcp]
-#DEBUG=YES
-DISABLEV4 = YES
USE_LOCALADDR = YES
+[nat]
BINDTO = 127.0.0.1
#BEHIND_NAT = NO
#ALLOW_NAT = NO
Modified: gnunet/src/transport/test_transport_ats_4addr.conf
===================================================================
--- gnunet/src/transport/test_transport_ats_4addr.conf 2011-06-09 12:02:49 UTC
(rev 15488)
+++ gnunet/src/transport/test_transport_ats_4addr.conf 2011-06-09 13:13:05 UTC
(rev 15489)
@@ -33,7 +33,9 @@
PORT = 2567
[transport-tcp]
-#DEBUG=YES
+USE_LOCALADDR = YES
+
+[nat]
DISABLEV6 = YES
BINDTO = 127.0.0.1
BEHIND_NAT = NO
@@ -41,7 +43,6 @@
ENABLE_UPNP = NO
EXTERNAL_ADDRESS = 127.0.0.1
INTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = YES
[transport-unix]
PORT = 2572
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r15489 - in gnunet: contrib src/transport,
gnunet <=