diff options
author | Daniel Golle <daniel@makrotopia.org> | 2016-04-18 12:08:38 +0000 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2016-04-18 12:08:38 +0000 |
commit | 85ebcc0bfdaadb37662a77b17cb3cda4d46a92c1 (patch) | |
tree | 008e8a24267aad8ba58154a08dccbd74bef05bb4 /src/dns/gnunet-service-dns.c | |
parent | 7200a570471907816431a57fe914ff5557118ee9 (diff) | |
download | gnunet-85ebcc0bfdaadb37662a77b17cb3cda4d46a92c1.tar.gz gnunet-85ebcc0bfdaadb37662a77b17cb3cda4d46a92c1.zip |
dns: add support for skipping the routing setup
Diffstat (limited to 'src/dns/gnunet-service-dns.c')
-rw-r--r-- | src/dns/gnunet-service-dns.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c index 0f975e82f..972c96f6d 100644 --- a/src/dns/gnunet-service-dns.c +++ b/src/dns/gnunet-service-dns.c | |||
@@ -219,7 +219,7 @@ static struct GNUNET_HELPER_Handle *hijacker; | |||
219 | /** | 219 | /** |
220 | * Command-line arguments we are giving to the hijacker process. | 220 | * Command-line arguments we are giving to the hijacker process. |
221 | */ | 221 | */ |
222 | static char *helper_argv[7]; | 222 | static char *helper_argv[8]; |
223 | 223 | ||
224 | /** | 224 | /** |
225 | * Head of DLL of clients we consult. | 225 | * Head of DLL of clients we consult. |
@@ -284,7 +284,7 @@ cleanup_task (void *cls GNUNET_UNUSED) | |||
284 | GNUNET_HELPER_stop (hijacker, GNUNET_NO); | 284 | GNUNET_HELPER_stop (hijacker, GNUNET_NO); |
285 | hijacker = NULL; | 285 | hijacker = NULL; |
286 | } | 286 | } |
287 | for (i=0;i<7;i++) | 287 | for (i=0;i<8;i++) |
288 | GNUNET_free_non_null (helper_argv[i]); | 288 | GNUNET_free_non_null (helper_argv[i]); |
289 | for (i=0;i<=UINT16_MAX;i++) | 289 | for (i=0;i<=UINT16_MAX;i++) |
290 | cleanup_rr (&requests[i]); | 290 | cleanup_rr (&requests[i]); |
@@ -1040,6 +1040,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
1040 | struct in6_addr dns_exit6; | 1040 | struct in6_addr dns_exit6; |
1041 | char *dns_exit; | 1041 | char *dns_exit; |
1042 | char *binary; | 1042 | char *binary; |
1043 | int nortsetup; | ||
1043 | 1044 | ||
1044 | cfg = cfg_; | 1045 | cfg = cfg_; |
1045 | stats = GNUNET_STATISTICS_create ("dns", cfg); | 1046 | stats = GNUNET_STATISTICS_create ("dns", cfg); |
@@ -1136,7 +1137,15 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
1136 | return; | 1137 | return; |
1137 | } | 1138 | } |
1138 | helper_argv[5] = ipv4mask; | 1139 | helper_argv[5] = ipv4mask; |
1139 | helper_argv[6] = NULL; | 1140 | |
1141 | nortsetup = GNUNET_CONFIGURATION_get_value_yesno (cfg, "dns", | ||
1142 | "SKIP_ROUTING_SETUP"); | ||
1143 | if (GNUNET_YES == nortsetup) | ||
1144 | helper_argv[6] = GNUNET_strdup("1"); | ||
1145 | else | ||
1146 | helper_argv[6] = GNUNET_strdup("0"); | ||
1147 | |||
1148 | helper_argv[7] = NULL; | ||
1140 | hijacker = GNUNET_HELPER_start (GNUNET_NO, | 1149 | hijacker = GNUNET_HELPER_start (GNUNET_NO, |
1141 | "gnunet-helper-dns", | 1150 | "gnunet-helper-dns", |
1142 | helper_argv, | 1151 | helper_argv, |