diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-07-03 10:31:57 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-07-03 10:31:57 +0200 |
commit | f599b93d5b402cfa795aaf7bd7057d76c5e57d67 (patch) | |
tree | 0f953e5343e27e91e47f7ccc72756207437d023e /src/exit | |
parent | d80df28d5f4814f93b8aa536a1064c77e3d659cc (diff) | |
parent | 6cc0e50715eb97baac69c05141f3f3bb3df4ec75 (diff) | |
download | gnunet-f599b93d5b402cfa795aaf7bd7057d76c5e57d67.tar.gz gnunet-f599b93d5b402cfa795aaf7bd7057d76c5e57d67.zip |
Merge remote-tracking branch 'origin/master' into credentials
Diffstat (limited to 'src/exit')
-rw-r--r-- | src/exit/gnunet-daemon-exit.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c index 87b30c04a..d9a5dd684 100644 --- a/src/exit/gnunet-daemon-exit.c +++ b/src/exit/gnunet-daemon-exit.c | |||
@@ -3852,7 +3852,8 @@ run (void *cls, | |||
3852 | 3852 | ||
3853 | /* Cadet handle acquired, now open ports and announce regular | 3853 | /* Cadet handle acquired, now open ports and announce regular |
3854 | expressions matching our exit */ | 3854 | expressions matching our exit */ |
3855 | if ( (GNUNET_YES == ipv4_enabled) && (GNUNET_YES == ipv4_exit) ) | 3855 | if ( (GNUNET_YES == ipv4_enabled) && |
3856 | (GNUNET_YES == ipv4_exit) ) | ||
3856 | { | 3857 | { |
3857 | GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_IPV4_GATEWAY, | 3858 | GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_IPV4_GATEWAY, |
3858 | strlen (GNUNET_APPLICATION_PORT_IPV4_GATEWAY), | 3859 | strlen (GNUNET_APPLICATION_PORT_IPV4_GATEWAY), |
@@ -3931,12 +3932,12 @@ run (void *cls, | |||
3931 | GNUNET_free (prefixed_regex); | 3932 | GNUNET_free (prefixed_regex); |
3932 | } | 3933 | } |
3933 | } | 3934 | } |
3934 | if ((ipv4_exit) || (ipv6_exit)) | 3935 | helper_handle = GNUNET_HELPER_start (GNUNET_NO, |
3935 | helper_handle = GNUNET_HELPER_start (GNUNET_NO, | 3936 | "gnunet-helper-exit", |
3936 | "gnunet-helper-exit", | 3937 | exit_argv, |
3937 | exit_argv, | 3938 | &message_token, |
3938 | &message_token, | 3939 | NULL, |
3939 | NULL, NULL); | 3940 | NULL); |
3940 | } | 3941 | } |
3941 | 3942 | ||
3942 | 3943 | ||