From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 28 Nov 2010 21:22:27 +0000 (+0000)
Subject: stuff
X-Git-Tag: initial-import-from-subversion-38251~19609
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3d9249277dfe61dce18bfc639f597e18daee0dbf;p=oweals%2Fgnunet.git

stuff
---

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index 6c6faa3d7..b29a79361 100644
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -16,20 +16,39 @@ WEAKRANDOM = NO
 HOME = $SERVICEHOME
 
 [transport-tcp]
+# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
 PORT = 2086
+
+# Should we use ICMP-based NAT traversal to try connect to NATed peers?
+ALLOW_NAT = YES
+
+# Are we behind NAT and should use ICMP-based NAT traversal?
+BEHIND_NAT = YES
+
+# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
+# normal interface IP address for non-NATed peers; 
+# likely auto-detected (via interface list) if not specified (!)
+# INTERNAL_ADDRESS = 
+
+# External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
+# normal interface IP address for non-NATed peers; 
+# possibly auto-detected (using UPnP) if possible if not specified
+# EXTERNAL_ADDRESS = 
+
+# Only bind to a specific IP address; if both are given, this should be idential to INTERNAL_ADDRESS
+# (but use different: this one restricts our bind!)
+# BINDTO =
+
 TIMEOUT = 300000
-# MAXBUF =
+
+# Are we allowed to try UPnP/PMP?
+ENABLE_UPNP = YES
+# Disable IPv6 support
 # DISABLEV6 =
-# BINDTO =
 # ACCEPT_FROM =
 # ACCEPT_FROM6 =
 # REJECT_FROM =
 # REJECT_FROM6 =
-# BEHIND_NAT =
-# ONLY_NAT_ADDRESSES =
-# ALLOW_NAT = 
-# INTERNAL_ADDRESS = 
-# EXTERNAL_ADDRESS = 
 
 [transport-udp]
 PORT = 2086
diff --git a/contrib/seaspider.jar b/contrib/seaspider.jar
index 4920869c3..aa7433867 100644
Binary files a/contrib/seaspider.jar and b/contrib/seaspider.jar differ