diff options
Diffstat (limited to 'src/nat-auto/gnunet-nat-auto.c')
-rw-r--r-- | src/nat-auto/gnunet-nat-auto.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/nat-auto/gnunet-nat-auto.c b/src/nat-auto/gnunet-nat-auto.c index 3b9a5fa94..d411c6d75 100644 --- a/src/nat-auto/gnunet-nat-auto.c +++ b/src/nat-auto/gnunet-nat-auto.c | |||
@@ -37,7 +37,7 @@ static int global_ret; | |||
37 | /** | 37 | /** |
38 | * Handle to ongoing autoconfiguration. | 38 | * Handle to ongoing autoconfiguration. |
39 | */ | 39 | */ |
40 | static struct GNUNET_NAT_AutoHandle *ah; | 40 | static struct GNUNET_NAT_AUTO_AutoHandle *ah; |
41 | 41 | ||
42 | /** | 42 | /** |
43 | * If we do auto-configuration, should we write the result | 43 | * If we do auto-configuration, should we write the result |
@@ -75,7 +75,7 @@ static unsigned int do_auto; | |||
75 | /** | 75 | /** |
76 | * Handle to a NAT test operation. | 76 | * Handle to a NAT test operation. |
77 | */ | 77 | */ |
78 | static struct GNUNET_NAT_Test *nt; | 78 | static struct GNUNET_NAT_AUTO_Test *nt; |
79 | 79 | ||
80 | /** | 80 | /** |
81 | * Flag set to 1 if we use IPPROTO_UDP. | 81 | * Flag set to 1 if we use IPPROTO_UDP. |
@@ -178,7 +178,7 @@ auto_config_cb (void *cls, | |||
178 | 178 | ||
179 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, | 179 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
180 | "NAT status: %s/%s\n", | 180 | "NAT status: %s/%s\n", |
181 | GNUNET_NAT_status2string (result), | 181 | GNUNET_NAT_AUTO_status2string (result), |
182 | nat_type); | 182 | nat_type); |
183 | 183 | ||
184 | /* Shortcut: if there are no changes suggested, bail out early. */ | 184 | /* Shortcut: if there are no changes suggested, bail out early. */ |
@@ -256,7 +256,7 @@ test_report_cb (void *cls, | |||
256 | { | 256 | { |
257 | nt = NULL; | 257 | nt = NULL; |
258 | PRINTF ("NAT test result: %s\n", | 258 | PRINTF ("NAT test result: %s\n", |
259 | GNUNET_NAT_status2string (result)); | 259 | GNUNET_NAT_AUTO_status2string (result)); |
260 | test_finished (); | 260 | test_finished (); |
261 | } | 261 | } |
262 | 262 | ||
@@ -271,12 +271,12 @@ do_shutdown (void *cls) | |||
271 | { | 271 | { |
272 | if (NULL != ah) | 272 | if (NULL != ah) |
273 | { | 273 | { |
274 | GNUNET_NAT_autoconfig_cancel (ah); | 274 | GNUNET_NAT_AUTO_autoconfig_cancel (ah); |
275 | ah = NULL; | 275 | ah = NULL; |
276 | } | 276 | } |
277 | if (NULL != nt) | 277 | if (NULL != nt) |
278 | { | 278 | { |
279 | GNUNET_NAT_test_stop (nt); | 279 | GNUNET_NAT_AUTO_test_stop (nt); |
280 | nt = NULL; | 280 | nt = NULL; |
281 | } | 281 | } |
282 | } | 282 | } |
@@ -307,7 +307,7 @@ run (void *cls, | |||
307 | 307 | ||
308 | if (do_auto) | 308 | if (do_auto) |
309 | { | 309 | { |
310 | ah = GNUNET_NAT_autoconfig_start (c, | 310 | ah = GNUNET_NAT_AUTO_autoconfig_start (c, |
311 | &auto_config_cb, | 311 | &auto_config_cb, |
312 | NULL); | 312 | NULL); |
313 | } | 313 | } |
@@ -360,14 +360,14 @@ run (void *cls, | |||
360 | { | 360 | { |
361 | if (NULL == extern_addr) | 361 | if (NULL == extern_addr) |
362 | extern_sa = bind_sa; | 362 | extern_sa = bind_sa; |
363 | nt = GNUNET_NAT_test_start (c, | 363 | nt = GNUNET_NAT_AUTO_test_start (c, |
364 | proto, | 364 | proto, |
365 | bind_sa.sin_addr, | 365 | bind_sa.sin_addr, |
366 | ntohs (bind_sa.sin_port), | 366 | ntohs (bind_sa.sin_port), |
367 | extern_sa.sin_addr, | 367 | extern_sa.sin_addr, |
368 | ntohs (extern_sa.sin_port), | 368 | ntohs (extern_sa.sin_port), |
369 | &test_report_cb, | 369 | &test_report_cb, |
370 | NULL); | 370 | NULL); |
371 | } | 371 | } |
372 | test_finished (); | 372 | test_finished (); |
373 | } | 373 | } |