diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-10-08 22:15:57 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-10-08 22:15:57 +0200 |
commit | 5682fc71092a9d64654d83b5c8b45520bd32459b (patch) | |
tree | e0e4ca390e00abfad521bde5f50140534c2525db | |
parent | 08b084003d06ea0db8fb645c4d30f5153a2af56e (diff) | |
download | gnunet-5682fc71092a9d64654d83b5c8b45520bd32459b.tar.gz gnunet-5682fc71092a9d64654d83b5c8b45520bd32459b.zip |
allow to disable IP scan w/ HOLE_EXTERNAL; thanks Corvus Corax
-rw-r--r-- | src/nat/gnunet-service-nat.c | 15 | ||||
-rw-r--r-- | src/nat/nat.conf.in | 3 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c index 694949dde..59a340324 100644 --- a/src/nat/gnunet-service-nat.c +++ b/src/nat/gnunet-service-nat.c | |||
@@ -335,6 +335,11 @@ static struct StunExternalIP *se_tail; | |||
335 | */ | 335 | */ |
336 | int enable_upnp; | 336 | int enable_upnp; |
337 | 337 | ||
338 | /** | ||
339 | * Is IP Scanning enabled? #GNUNET_YES if enabled, #GNUNET_NO if disabled, | ||
340 | * without, only explicitly specified IPs will be handled (HOLE_EXTERNAL) | ||
341 | */ | ||
342 | int enable_ipscan; | ||
338 | 343 | ||
339 | /** | 344 | /** |
340 | * Remove and free an entry from the #lal_head DLL. | 345 | * Remove and free an entry from the #lal_head DLL. |
@@ -1939,12 +1944,18 @@ run (void *cls, | |||
1939 | &dyndns_frequency)) | 1944 | &dyndns_frequency)) |
1940 | dyndns_frequency = DYNDNS_FREQUENCY; | 1945 | dyndns_frequency = DYNDNS_FREQUENCY; |
1941 | 1946 | ||
1947 | enable_ipscan | ||
1948 | = GNUNET_CONFIGURATION_get_value_yesno (cfg, | ||
1949 | "NAT", | ||
1950 | "ENABLE_IPSCAN"); | ||
1951 | |||
1942 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, | 1952 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, |
1943 | NULL); | 1953 | NULL); |
1944 | stats = GNUNET_STATISTICS_create ("nat", | 1954 | stats = GNUNET_STATISTICS_create ("nat", |
1945 | cfg); | 1955 | cfg); |
1946 | scan_task = GNUNET_SCHEDULER_add_now (&run_scan, | 1956 | if (GNUNET_YES == enable_ipscan) |
1947 | NULL); | 1957 | scan_task = GNUNET_SCHEDULER_add_now (&run_scan, |
1958 | NULL); | ||
1948 | } | 1959 | } |
1949 | 1960 | ||
1950 | 1961 | ||
diff --git a/src/nat/nat.conf.in b/src/nat/nat.conf.in index a8dbee953..4c068c394 100644 --- a/src/nat/nat.conf.in +++ b/src/nat/nat.conf.in | |||
@@ -12,6 +12,9 @@ UNIX_MATCH_GID = YES | |||
12 | # Enable UPNP by default? | 12 | # Enable UPNP by default? |
13 | ENABLE_UPNP = YES | 13 | ENABLE_UPNP = YES |
14 | 14 | ||
15 | # Enable scanning for all system IP addresses? | ||
16 | ENABLE_IPSCAN = YES | ||
17 | |||
15 | # Disable IPv6 support | 18 | # Disable IPv6 support |
16 | # FIXME: move entirely to transport plugins! | 19 | # FIXME: move entirely to transport plugins! |
17 | DISABLEV6 = NO | 20 | DISABLEV6 = NO |