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 /src | |
parent | c62b46170dfbd969f8cbadc4f3069a45832b804f (diff) | |
parent | 28cee751620724a0da631dfa8b9c1123871e1e32 (diff) | |
download | gnunet-99c89e00b6d288e749a10947ba7473a4beaf747d.tar.gz gnunet-99c89e00b6d288e749a10947ba7473a4beaf747d.zip |
Merge branch 'h2020' of git+ssh://gnunet.org/gnunet into h2020
Diffstat (limited to 'src')
-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 e8c1f5d4a..2b3f81567 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -280,6 +280,7 @@ gnunet_service_transport_CFLAGS = \ | |||
280 | 280 | ||
281 | plugin_LTLIBRARIES = \ | 281 | plugin_LTLIBRARIES = \ |
282 | libgnunet_plugin_transport_tcp.la \ | 282 | libgnunet_plugin_transport_tcp.la \ |
283 | libgnunet_plugin_transport_xt.la \ | ||
283 | libgnunet_plugin_transport_udp.la \ | 284 | libgnunet_plugin_transport_udp.la \ |
284 | $(UNIX_PLUGIN_LA) \ | 285 | $(UNIX_PLUGIN_LA) \ |
285 | $(HTTP_CLIENT_PLUGIN_LA) \ | 286 | $(HTTP_CLIENT_PLUGIN_LA) \ |
@@ -306,6 +307,18 @@ libgnunet_plugin_transport_tcp_la_LIBADD = \ | |||
306 | libgnunet_plugin_transport_tcp_la_LDFLAGS = \ | 307 | libgnunet_plugin_transport_tcp_la_LDFLAGS = \ |
307 | $(GN_PLUGIN_LDFLAGS) | 308 | $(GN_PLUGIN_LDFLAGS) |
308 | 309 | ||
310 | libgnunet_plugin_transport_xt_la_SOURCES = \ | ||
311 | plugin_transport_xt.c | ||
312 | libgnunet_plugin_transport_xt_la_LIBADD = \ | ||
313 | $(top_builddir)/src/hello/libgnunethello.la \ | ||
314 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | ||
315 | $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ | ||
316 | $(top_builddir)/src/nat/libgnunetnatnew.la \ | ||
317 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
318 | $(LTLIBINTL) | ||
319 | libgnunet_plugin_transport_xt_la_LDFLAGS = \ | ||
320 | $(GN_PLUGIN_LDFLAGS) | ||
321 | |||
309 | libgnunet_plugin_transport_template_la_SOURCES = \ | 322 | libgnunet_plugin_transport_template_la_SOURCES = \ |
310 | plugin_transport_template.c | 323 | plugin_transport_template.c |
311 | libgnunet_plugin_transport_template_la_LIBADD = \ | 324 | libgnunet_plugin_transport_template_la_LIBADD = \ |
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in index 2c99af000..a541080ce 100644 --- a/src/transport/transport.conf.in +++ b/src/transport/transport.conf.in | |||
@@ -68,6 +68,38 @@ MAX_CONNECTIONS = 128 | |||
68 | TCP_STEALTH = NO | 68 | TCP_STEALTH = NO |
69 | 69 | ||
70 | 70 | ||
71 | |||
72 | [transport-xt] | ||
73 | # Use 0 to ONLY advertise as a peer behind NAT (no port binding) | ||
74 | PORT = 2087 | ||
75 | |||
76 | # Obsolete option, to be replaced by HOLE_EXTERNAL (soon) | ||
77 | ADVERTISED_PORT = 2087 | ||
78 | |||
79 | # If we have a manually punched NAT, what is the external IP and port? | ||
80 | # Can use DNS names for DynDNS-based detection of external IP. | ||
81 | # Can use IPv6 addresses ([fefc::]:PORT). | ||
82 | # Use "AUTO" for the hostname to automatically detect external IP. | ||
83 | # Do not set if NAT is not manually punched. | ||
84 | # HOLE_EXTERNAL = AUTO:2087 | ||
85 | |||
86 | TESTING_IGNORE_KEYS = ACCEPT_FROM; | ||
87 | |||
88 | # Maximum number of open TCP connections allowed | ||
89 | MAX_CONNECTIONS = 128 | ||
90 | |||
91 | TIMEOUT = 5 s | ||
92 | # ACCEPT_FROM = | ||
93 | # ACCEPT_FROM6 = | ||
94 | # REJECT_FROM = | ||
95 | # REJECT_FROM6 = | ||
96 | # BINDTO = | ||
97 | MAX_CONNECTIONS = 128 | ||
98 | |||
99 | # Enable TCP stealth? | ||
100 | TCP_STEALTH = NO | ||
101 | |||
102 | |||
71 | [transport-udp] | 103 | [transport-udp] |
72 | # Use PORT = 0 to autodetect a port available | 104 | # Use PORT = 0 to autodetect a port available |
73 | PORT = 2086 | 105 | PORT = 2086 |