aboutsummaryrefslogtreecommitdiff
path: root/src/setup/gnunet-setup-transport.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/setup/gnunet-setup-transport.c')
-rw-r--r--src/setup/gnunet-setup-transport.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/setup/gnunet-setup-transport.c b/src/setup/gnunet-setup-transport.c
index 40193f34..08cc39d9 100644
--- a/src/setup/gnunet-setup-transport.c
+++ b/src/setup/gnunet-setup-transport.c
@@ -89,7 +89,7 @@ enum AutoPhase
89 * Last phase, we're done. 89 * Last phase, we're done.
90 */ 90 */
91 AUTO_DONE 91 AUTO_DONE
92 92
93}; 93};
94 94
95 95
@@ -108,12 +108,12 @@ struct GNUNET_SetupAutoContext
108 * Function to call when done. 108 * Function to call when done.
109 */ 109 */
110 GNUNET_SetupAutoConfigFinished fin_cb; 110 GNUNET_SetupAutoConfigFinished fin_cb;
111 111
112 /** 112 /**
113 * Closure for 'fin_cb'. 113 * Closure for 'fin_cb'.
114 */ 114 */
115 void *fin_cb_cls; 115 void *fin_cb_cls;
116 116
117 /** 117 /**
118 * Handle for active 'GNUNET_NAT_mini_get_external_ipv4'-operation. 118 * Handle for active 'GNUNET_NAT_mini_get_external_ipv4'-operation.
119 */ 119 */
@@ -178,12 +178,12 @@ result_callback (void *cls, int success)
178 GNUNET_NAT_test_stop (ac->tst); 178 GNUNET_NAT_test_stop (ac->tst);
179 ac->tst = NULL; 179 ac->tst = NULL;
180 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 180 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
181 success 181 success
182 ? _("NAT traversal with ICMP Server succeeded.\n") 182 ? _("NAT traversal with ICMP Server succeeded.\n")
183 : _("NAT traversal with ICMP Server failed.\n")); 183 : _("NAT traversal with ICMP Server failed.\n"));
184 update_icmp_server_enable_button (success); 184 update_icmp_server_enable_button (success);
185 if (NULL != cfg) 185 if (NULL != cfg)
186 GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_ICMP_SERVER", 186 GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_ICMP_SERVER",
187 success ? "YES": "NO"); 187 success ? "YES": "NO");
188 next_phase (ac); 188 next_phase (ac);
189} 189}
@@ -373,7 +373,7 @@ nipo (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
373 373
374 374
375/** 375/**
376 * Determine our local IP addresses; detect internal IP & IPv6-support 376 * Determine our local IP addresses; detect internal IP & IPv6-support
377 * 377 *
378 * @param ac auto setup context 378 * @param ac auto setup context
379 */ 379 */
@@ -389,7 +389,7 @@ test_local_ip (struct GNUNET_SetupAutoContext *ac)
389 gtk_toggle_button_set_active (button, 389 gtk_toggle_button_set_active (button,
390 (GNUNET_YES == have_v6) ? FALSE : TRUE); 390 (GNUNET_YES == have_v6) ? FALSE : TRUE);
391 if (NULL != cfg) 391 if (NULL != cfg)
392 GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "DISABLEV6", 392 GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "DISABLEV6",
393 (GNUNET_YES == have_v6) ? "NO" : "YES"); 393 (GNUNET_YES == have_v6) ? "NO" : "YES");
394 next_phase (ac); 394 next_phase (ac);
395} 395}
@@ -426,7 +426,7 @@ test_upnpc (struct GNUNET_SetupAutoContext *ac)
426 /* FIXME: test if upnpc is actually working, that is, if transports 426 /* FIXME: test if upnpc is actually working, that is, if transports
427 start to work once we use UPnP */ 427 start to work once we use UPnP */
428 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 428 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
429 (have_upnpc) 429 (have_upnpc)
430 ? _("upnpc found, enabling its use\n") 430 ? _("upnpc found, enabling its use\n")
431 : _("upnpc not found\n")); 431 : _("upnpc not found\n"));
432 gtk_toggle_button_set_active (button, 432 gtk_toggle_button_set_active (button,
@@ -434,7 +434,7 @@ test_upnpc (struct GNUNET_SetupAutoContext *ac)
434 ? TRUE 434 ? TRUE
435 : FALSE); 435 : FALSE);
436 if (NULL != cfg) 436 if (NULL != cfg)
437 GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_UPNP", 437 GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_UPNP",
438 (GNUNET_YES == have_upnpc) ? "YES" : "NO"); 438 (GNUNET_YES == have_upnpc) ? "YES" : "NO");
439 next_phase (ac); 439 next_phase (ac);
440} 440}
@@ -465,7 +465,7 @@ test_icmp_server (struct GNUNET_SetupAutoContext *ac)
465 GNUNET_free_non_null (tmp); 465 GNUNET_free_non_null (tmp);
466 GNUNET_free (binary); 466 GNUNET_free (binary);
467 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 467 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
468 (hns) 468 (hns)
469 ? _("gnunet-helper-nat-server found, testing it\n") 469 ? _("gnunet-helper-nat-server found, testing it\n")
470 : _("No working gnunet-helper-nat-server found\n")); 470 : _("No working gnunet-helper-nat-server found\n"));
471 if (hns) 471 if (hns)
@@ -501,7 +501,7 @@ test_icmp_client (struct GNUNET_SetupAutoContext *ac)
501 GNUNET_free_non_null (tmp); 501 GNUNET_free_non_null (tmp);
502 GNUNET_free (binary); 502 GNUNET_free (binary);
503 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 503 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
504 (hnc) 504 (hnc)
505 ? _("gnunet-helper-nat-client found, enabling it\n") 505 ? _("gnunet-helper-nat-client found, enabling it\n")
506 : _("gnunet-helper-nat-client not found or behind NAT, disabling it\n")); 506 : _("gnunet-helper-nat-client not found or behind NAT, disabling it\n"));
507 button = 507 button =
@@ -517,7 +517,7 @@ test_icmp_client (struct GNUNET_SetupAutoContext *ac)
517 * 517 *
518 * @param fin_cb function to call when done 518 * @param fin_cb function to call when done
519 * @param fin_cb_cls closure for 'fin_cb' 519 * @param fin_cb_cls closure for 'fin_cb'
520 * @return handle for the operation 520 * @return handle for the operation
521 */ 521 */
522struct GNUNET_SetupAutoContext * 522struct GNUNET_SetupAutoContext *
523GNUNET_setup_transport_autoconfig_start (GNUNET_SetupAutoConfigFinished fin_cb, 523GNUNET_setup_transport_autoconfig_start (GNUNET_SetupAutoConfigFinished fin_cb,
@@ -530,8 +530,8 @@ GNUNET_setup_transport_autoconfig_start (GNUNET_SetupAutoConfigFinished fin_cb,
530 ac->fin_cb_cls = fin_cb_cls; 530 ac->fin_cb_cls = fin_cb_cls;
531 531
532 /* never use loopback addresses if user wanted autoconfiguration */ 532 /* never use loopback addresses if user wanted autoconfiguration */
533 GNUNET_CONFIGURATION_set_value_string (cfg, "nat", 533 GNUNET_CONFIGURATION_set_value_string (cfg, "nat",
534 "USE_LOCALADDR", 534 "USE_LOCALADDR",
535 "NO"); 535 "NO");
536 next_phase (ac); 536 next_phase (ac);
537 return ac; 537 return ac;
@@ -608,7 +608,7 @@ GNUNET_setup_transport_autoconfig_button_clicked_cb ()
608 if (NULL != ac) 608 if (NULL != ac)
609 { 609 {
610 GNUNET_break (0); 610 GNUNET_break (0);
611 return; 611 return;
612 } 612 }
613 gtk_widget_set_sensitive (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_transport_autoconfig_button")), 613 gtk_widget_set_sensitive (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_transport_autoconfig_button")),
614 FALSE); 614 FALSE);