diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-05-26 20:44:34 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-05-26 20:44:34 +0200 |
| commit | 99c89e00b6d288e749a10947ba7473a4beaf747d (patch) | |
| tree | 6ce26c66ffa6ae10244091bb4c435312616b0445 | |
| parent | c62b46170dfbd969f8cbadc4f3069a45832b804f (diff) | |
| parent | 28cee751620724a0da631dfa8b9c1123871e1e32 (diff) | |
Merge branch 'h2020' of git+ssh://gnunet.org/gnunet into h2020
| -rw-r--r-- | src/transport/Makefile.am | 13 | ||||
| -rw-r--r-- | src/transport/transport.conf.in | 32 |
2 files changed, 45 insertions, 0 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index e8c1f5d4aa..2b3f81567d 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -280,6 +280,7 @@ gnunet_service_transport_CFLAGS = \ plugin_LTLIBRARIES = \ libgnunet_plugin_transport_tcp.la \ + libgnunet_plugin_transport_xt.la \ libgnunet_plugin_transport_udp.la \ $(UNIX_PLUGIN_LA) \ $(HTTP_CLIENT_PLUGIN_LA) \ @@ -306,6 +307,18 @@ libgnunet_plugin_transport_tcp_la_LIBADD = \ libgnunet_plugin_transport_tcp_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) +libgnunet_plugin_transport_xt_la_SOURCES = \ + plugin_transport_xt.c +libgnunet_plugin_transport_xt_la_LIBADD = \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ + $(top_builddir)/src/nat/libgnunetnatnew.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) +libgnunet_plugin_transport_xt_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + libgnunet_plugin_transport_template_la_SOURCES = \ plugin_transport_template.c libgnunet_plugin_transport_template_la_LIBADD = \ diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in index 2c99af000d..a541080ce7 100644 --- a/src/transport/transport.conf.in +++ b/src/transport/transport.conf.in @@ -68,6 +68,38 @@ MAX_CONNECTIONS = 128 TCP_STEALTH = NO + +[transport-xt] +# Use 0 to ONLY advertise as a peer behind NAT (no port binding) +PORT = 2087 + +# Obsolete option, to be replaced by HOLE_EXTERNAL (soon) +ADVERTISED_PORT = 2087 + +# If we have a manually punched NAT, what is the external IP and port? +# Can use DNS names for DynDNS-based detection of external IP. +# Can use IPv6 addresses ([fefc::]:PORT). +# Use "AUTO" for the hostname to automatically detect external IP. +# Do not set if NAT is not manually punched. +# HOLE_EXTERNAL = AUTO:2087 + +TESTING_IGNORE_KEYS = ACCEPT_FROM; + +# Maximum number of open TCP connections allowed +MAX_CONNECTIONS = 128 + +TIMEOUT = 5 s +# ACCEPT_FROM = +# ACCEPT_FROM6 = +# REJECT_FROM = +# REJECT_FROM6 = +# BINDTO = +MAX_CONNECTIONS = 128 + +# Enable TCP stealth? +TCP_STEALTH = NO + + [transport-udp] # Use PORT = 0 to autodetect a port available PORT = 2086 |