*/
#include "platform.h"
#include "gnunet_util_lib.h"
+#include "gnunet_resolver_service.h"
#include "gnunet_nat_lib.h"
#include "nat.h"
/**
* Test if we are online.
*/
- AUTO_ONLINE = 1,
+ AUTO_ONLINE,
/**
* Test our external IP.
* Last phase, we're done.
*/
AUTO_DONE
-
+
};
* Function to call when done.
*/
GNUNET_NAT_AutoResultCallback fin_cb;
-
+
/**
- * Closure for 'fin_cb'.
+ * Closure for @e fin_cb.
*/
void *fin_cb_cls;
-
+
/**
* Handle for active 'GNUNET_NAT_mini_get_external_ipv4'-operation.
*/
/**
* Task identifier for the timeout.
*/
- GNUNET_SCHEDULER_TaskIdentifier tsk;
+ GNUNET_SCHEDULER_TaskIdentifier task;
/**
* Where are we in the test?
*/
enum AutoPhase phase;
+ /**
+ * Do we have IPv6?
+ */
+ int have_v6;
+
+ /**
+ * Error code for better debugging and user feedback
+ */
+ enum GNUNET_NAT_StatusCode ret;
};
/**
* Run the next phase of the auto test.
*
- * @param ac auto test handle
+ * @param ah auto test handle
*/
static void
-next_phase (struct GNUNET_NAT_AutoHandle *ac);
-
-
-
- GNUNET_break (0);
- return;
- }
- gtk_toggle_button_set_active (button, on ? TRUE : FALSE);
-}
-
+next_phase (struct GNUNET_NAT_AutoHandle *ah);
/**
- * Function called if NAT failed to confirm success.
- * Clean up and update GUI (with failure).
+ * Function called by NAT to report the outcome of the nat-test.
+ * Clean up and update GUI.
*
- * @param cls closure with setup context
- * @param tc scheduler callback
+ * @param cls the auto handle
+ * @param success currently always #GNUNET_OK
+ * @param emsg NULL on success, otherwise an error message
*/
static void
-fail_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+result_callback (void *cls,
+ enum GNUNET_NAT_StatusCode ret)
{
- struct GNUNET_NAT_AutoHandle *ac = cls;
-
+ struct GNUNET_NAT_AutoHandle *ah = cls;
+ if (GNUNET_NAT_ERROR_SUCCESS == ret)
+ GNUNET_NAT_test_stop (ah->tst);
+ ah->tst = NULL;
+ ah->ret = ret;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("NAT traversal with ICMP Server timed out.\n"));
- GNUNET_assert (NULL != ac->tst);
- ac->tsk = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_NAT_test_stop (ac->tst);
- ac->tst = NULL;
- update_icmp_server_enable_button (GNUNET_NO);
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_ICMP_SERVER", "NO");
- next_phase (ac);
+ GNUNET_NAT_ERROR_SUCCESS == ret
+ ? _("NAT traversal with ICMP Server succeeded.\n")
+ : _("NAT traversal with ICMP Server failed.\n"));
+ GNUNET_CONFIGURATION_set_value_string (ah->cfg, "nat", "ENABLE_ICMP_SERVER",
+ GNUNET_NAT_ERROR_SUCCESS == ret ? "NO" : "YES");
+ next_phase (ah);
}
/**
* Main function for the connection reversal test.
*
- * @param cls the 'int*' for the result
+ * @param cls the `struct GNUNET_NAT_AutoHandle`
* @param tc scheduler context
*/
static void
-reversal_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+reversal_test (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_NAT_AutoHandle *ac = cls;
+ struct GNUNET_NAT_AutoHandle *ah = cls;
+ ah->task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Testing connection reversal with ICMP server.\n"));
- GNUNET_assert (NULL != cfg);
- GNUNET_RESOLVER_connect (cfg);
- ac->tst = GNUNET_NAT_test_start (cfg, GNUNET_YES, 0, 0, &result_callback, ac);
- if (NULL == ac->tst)
- {
- next_phase (ac);
- return;
- }
- ac->tsk = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &fail_timeout, ac);
+ GNUNET_RESOLVER_connect (ah->cfg);
+ ah->tst = GNUNET_NAT_test_start (ah->cfg, GNUNET_YES, 0, 0, TIMEOUT,
+ &result_callback, ah);
}
/**
* Test if we are online at all.
*
- * @param ac auto setup context
+ * @param ah auto setup context
*/
static void
-test_online (struct GNUNET_NAT_AutoHandle *ac)
+test_online (struct GNUNET_NAT_AutoHandle *ah)
{
// FIXME: not implemented
- next_phase (ac);
+ /*
+ * if (failure)
+ * ah->ret = GNUNET_NAT_ERROR_NOT_ONLINE;
+ */
+ next_phase (ah);
}
*
* @param cls closure with our setup context
* @param addr the address, NULL on errors
+ * @param emsg NULL on success, otherwise an error message
*/
static void
-set_external_ipv4 (void *cls, const struct in_addr *addr)
+set_external_ipv4 (void *cls,
+ const struct in_addr *addr,
+ enum GNUNET_NAT_StatusCode ret)
{
- struct GNUNET_NAT_AutoHandle *ac = cls;
+ struct GNUNET_NAT_AutoHandle *ah = cls;
char buf[INET_ADDRSTRLEN];
- GObject *o;
- ac->eh = NULL;
- if (NULL == addr)
+ ah->eh = NULL;
+ ah->ret = ret;
+ if (GNUNET_NAT_ERROR_SUCCESS != ret)
{
- next_phase (ac);
+ next_phase (ah);
return;
}
/* enable 'behind nat' */
addr,
buf,
sizeof (buf)));
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "BEHIND_NAT", "YES");
- o = GNUNET_SETUP_get_object ("GNUNET_setup_transport_nat_checkbutton");
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (o), TRUE);
+ GNUNET_CONFIGURATION_set_value_string (ah->cfg, "nat", "BEHIND_NAT", "YES");
/* set external IP address */
if (NULL == inet_ntop (AF_INET, addr, buf, sizeof (buf)))
{
GNUNET_break (0);
- next_phase (ac);
+ /* actually, this should never happen, as the caller already executed just
+ * this check, but for consistency (eg: future changes in the caller)
+ * we still need to report this error...
+ */
+ ah->ret = GNUNET_NAT_ERROR_EXTERNAL_IP_ADDRESS_INVALID;
+ next_phase (ah);
return;
}
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "EXTERNAL_ADDRESS",
- buf);
- o = GNUNET_SETUP_get_object ("GNUNET_setup_transport_external_ip_address_entry");
- gtk_entry_set_text (GTK_ENTRY (o), buf);
- next_phase (ac);
+ GNUNET_CONFIGURATION_set_value_string (ah->cfg, "nat", "EXTERNAL_ADDRESS",
+ buf);
+ next_phase (ah);
}
/**
* Determine our external IPv4 address.
*
- * @param ac auto setup context
+ * @param ah auto setup context
*/
static void
-test_external_ip (struct GNUNET_NAT_AutoHandle *ac)
+test_external_ip (struct GNUNET_NAT_AutoHandle *ah)
{
+ if (GNUNET_NAT_ERROR_SUCCESS != ah->ret)
+ next_phase (ah);
+
// FIXME: CPS?
/* try to detect external IP */
- ac->eh = GNUNET_NAT_mini_get_external_ipv4 (TIMEOUT,
- &set_external_ipv4, ac);
+ ah->eh = GNUNET_NAT_mini_get_external_ipv4 (TIMEOUT,
+ &set_external_ipv4, ah);
}
* Process list of local IP addresses. Find and set the
* one of the default interface.
*
- * @param cls pointer to int to store if we have a non-local IPv6 address
+ * @param cls our `struct GNUNET_NAT_AutoHandle`
* @param name name of the interface (can be NULL for unknown)
* @param isDefault is this presumably the default interface
* @param addr address of this interface (can be NULL for unknown or unassigned)
* @param broadcast_addr the broadcast address (can be NULL for unknown or unassigned)
* @param netmask the network mask (can be NULL for unknown or unassigned))
- * @param addrlen length of the address
- * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
+ * @param addrlen length of the @a addr and @a broadcast_addr
+ * @return GNUNET_OK to continue iteration, #GNUNET_SYSERR to abort
*/
static int
-nipo (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
- const struct sockaddr *broadcast_addr, const struct sockaddr *netmask,
+process_if (void *cls,
+ const char *name,
+ int isDefault,
+ const struct sockaddr *addr,
+ const struct sockaddr *broadcast_addr,
+ const struct sockaddr *netmask,
socklen_t addrlen)
{
- int *have_v6 = cls;
+ struct GNUNET_NAT_AutoHandle *ah = cls;
const struct sockaddr_in *in;
char buf[INET_ADDRSTRLEN];
- GtkEntry *entry;
if (!isDefault)
return GNUNET_OK;
if ( (sizeof (struct sockaddr_in6) == addrlen) &&
- (0 != memcmp (&in6addr_loopback, addr,
- addrlen)) &&
- (! IN6_IS_ADDR_LINKLOCAL(addr)) )
+ (0 != memcmp (&in6addr_loopback, &((const struct sockaddr_in6 *) addr)->sin6_addr,
+ sizeof (struct in6_addr))) &&
+ (! IN6_IS_ADDR_LINKLOCAL(&((const struct sockaddr_in6 *) addr)->sin6_addr)) )
{
- *have_v6 = GNUNET_YES;
+ ah->have_v6 = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("This system has a global IPv6 address, setting IPv6 to supported.\n"));
return GNUNET_OK;
GNUNET_break (0);
return GNUNET_OK;
}
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "INTERNAL_ADDRESS", buf);
+ GNUNET_CONFIGURATION_set_value_string (ah->cfg, "nat", "INTERNAL_ADDRESS",
+ buf);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Detected internal network address `%s'.\n"),
buf);
- entry =
- GTK_ENTRY (GNUNET_SETUP_get_object
- ("GNUNET_setup_transport_internal_ip_entry"));
- gtk_entry_set_text (entry, buf);
+ ah->ret = GNUNET_NAT_ERROR_SUCCESS;
/* no need to continue iteration */
return GNUNET_SYSERR;
}
/**
- * Determine our local IP addresses; detect internal IP & IPv6-support
+ * Determine our local IP addresses; detect internal IP & IPv6-support
*
- * @param ac auto setup context
+ * @param ah auto setup context
*/
static void
-test_local_ip (struct GNUNET_NAT_AutoHandle *ac)
+test_local_ip (struct GNUNET_NAT_AutoHandle *ah)
{
- GtkToggleButton *button;
- int have_v6;
-
- have_v6 = GNUNET_NO;
- GNUNET_OS_network_interfaces_list (&nipo, &have_v6);
- button = GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object ("GNUNET_setup_transport_disable_ipv6_checkbutton"));
- gtk_toggle_button_set_active (button,
- (GNUNET_YES == have_v6) ? FALSE : TRUE);
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "DISABLEV6",
- (GNUNET_YES == have_v6) ? "NO" : "YES");
- next_phase (ac);
+ ah->have_v6 = GNUNET_NO;
+ ah->ret = GNUNET_NAT_ERROR_NO_VALID_IF_IP_COMBO; // reset to success if any of the IFs in below iterator has a valid IP
+ GNUNET_OS_network_interfaces_list (&process_if, ah);
+
+ GNUNET_CONFIGURATION_set_value_string (ah->cfg, "nat", "DISABLEV6",
+ (GNUNET_YES == ah->have_v6) ? "NO" : "YES");
+ next_phase (ah);
}
/**
* Test if NAT has been punched
*
- * @param ac auto setup context
+ * @param ah auto setup context
*/
static void
-test_nat_punched (struct GNUNET_NAT_AutoHandle *ac)
+test_nat_punched (struct GNUNET_NAT_AutoHandle *ah)
{
+ if (GNUNET_NAT_ERROR_SUCCESS != ah->ret)
+ next_phase (ah);
+
// FIXME: not implemented
- next_phase (ac);
+
+ next_phase (ah);
}
/**
* Test if UPnPC works.
*
- * @param ac auto setup context
+ * @param ah auto setup context
*/
static void
-test_upnpc (struct GNUNET_NAT_AutoHandle *ac)
+test_upnpc (struct GNUNET_NAT_AutoHandle *ah)
{
int have_upnpc;
- GtkToggleButton *button;
+ if (GNUNET_NAT_ERROR_SUCCESS != ah->ret)
+ next_phase (ah);
+
/* test if upnpc is available */
- button = GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object ("GNUNET_setup_transport_upnp_enable_checkbutton"));
have_upnpc = (GNUNET_SYSERR !=
- GNUNET_OS_check_helper_binary ("upnpc"));
+ GNUNET_OS_check_helper_binary ("upnpc", GNUNET_NO, NULL));
/* FIXME: test if upnpc is actually working, that is, if transports
start to work once we use UPnP */
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- (have_upnpc)
+ (have_upnpc)
? _("upnpc found, enabling its use\n")
: _("upnpc not found\n"));
- gtk_toggle_button_set_active (button,
- have_upnpc
- ? TRUE
- : FALSE);
- if (NULL != cfg)
- GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "ENABLE_UPNP",
- (GNUNET_YES == have_upnpc) ? "YES" : "NO");
- next_phase (ac);
+ GNUNET_CONFIGURATION_set_value_string (ah->cfg, "nat", "ENABLE_UPNP",
+ (GNUNET_YES == have_upnpc) ? "YES" : "NO");
+ next_phase (ah);
}
/**
* Test if ICMP server is working
*
- * @param ac auto setup context
+ * @param ah auto setup context
*/
static void
-test_icmp_server (struct GNUNET_NAT_AutoHandle *ac)
+test_icmp_server (struct GNUNET_NAT_AutoHandle *ah)
{
- int hns;
+ int ext_ip;
+ int nated;
+ int binary;
char *tmp;
- char *binary;
-
+ char *helper;
+ ext_ip = GNUNET_NO;
+ nated = GNUNET_NO;
+ binary = GNUNET_NO;
+
tmp = NULL;
- binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server");
- hns =
- ((GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "nat", "EXTERNAL_ADDRESS",
- &tmp)) && (0 < strlen (tmp)) &&
- (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "BEHIND_NAT")) &&
- (GNUNET_YES ==
- GNUNET_OS_check_helper_binary (binary)));
+ helper = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server");
+ if ((GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (ah->cfg, "nat", "EXTERNAL_ADDRESS",
+ &tmp)) && (0 < strlen (tmp))){
+ ext_ip = GNUNET_OK;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("test_icmp_server not possible, as we have no public IPv4 address\n"));
+ }
+ else
+ goto err;
+
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")){
+ nated = GNUNET_YES;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("test_icmp_server not possible, as we are not behind NAT\n"));
+ }
+ else
+ goto err;
+
+ if (GNUNET_YES ==
+ GNUNET_OS_check_helper_binary (helper, GNUNET_YES, "-d 127.0.0.1" )){
+ binary = GNUNET_OK; // use localhost as source for that one udp-port, ok for testing
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("No working gnunet-helper-nat-server found\n"));
+ }
+err:
GNUNET_free_non_null (tmp);
- GNUNET_free (binary);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- (hns)
- ? _("gnunet-helper-nat-server found, testing it\n")
- : _("No working gnunet-helper-nat-server found\n"));
- if (hns)
- GNUNET_SCHEDULER_add_now (&reversal_test, ac);
+ GNUNET_free (helper);
+
+ if (GNUNET_OK == ext_ip && GNUNET_YES == nated && GNUNET_OK == binary)
+ ah->task = GNUNET_SCHEDULER_add_now (&reversal_test, ah);
else
- next_phase (ac);
+ next_phase (ah);
}
/**
* Test if ICMP client is working
*
- * @param ac auto setup context
+ * @param ah auto setup context
*/
static void
-test_icmp_client (struct GNUNET_NAT_AutoHandle *ac)
+test_icmp_client (struct GNUNET_NAT_AutoHandle *ah)
{
- GtkToggleButton *button;
- int hnc;
char *tmp;
- char *binary;
+ char *helper;
tmp = NULL;
- binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-client");
- hnc =
- ((GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "nat", "INTERNAL_ADDRESS",
- &tmp)) && (0 < strlen (tmp)) &&
- (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_yesno (cfg, "nat", "BEHIND_NAT")) &&
- (GNUNET_YES ==
- GNUNET_OS_check_helper_binary (binary)));
+ helper = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-client");
+ if ((GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (ah->cfg, "nat", "INTERNAL_ADDRESS",
+ &tmp)) && (0 < strlen (tmp)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("test_icmp_client not possible, as we have no internal IPv4 address\n"));
+ }
+ else
+ goto err;
+
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")){
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("test_icmp_server not possible, as we are not behind NAT\n"));
+ }
+ else
+ goto err;
+
+ if (GNUNET_YES ==
+ GNUNET_OS_check_helper_binary (helper, GNUNET_YES, "-d 127.0.0.1 127.0.0.2 42")){
+ // none of these parameters are actually used in privilege testing mode
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("No working gnunet-helper-nat-server found\n"));
+ }
+err:
GNUNET_free_non_null (tmp);
- GNUNET_free (binary);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- (hnc)
- ? _("gnunet-helper-nat-client found, enabling it\n")
- : _("gnunet-helper-nat-client not found or behind NAT, disabling it\n"));
- button =
- GTK_TOGGLE_BUTTON (GNUNET_SETUP_get_object
- ("GNUNET_setup_transport_icmp_client_enable_checkbutton"));
- gtk_toggle_button_set_active (button, hnc ? TRUE : FALSE);
- next_phase (ac);
+ GNUNET_free (helper);
+
+ next_phase (ah);
}
* Run the next phase of the auto test.
*/
static void
-next_phase (struct GNUNET_NAT_AutoHandle *ac)
+next_phase (struct GNUNET_NAT_AutoHandle *ah)
{
- ac->phase++;
- switch (ac->phase)
+ struct GNUNET_CONFIGURATION_Handle *diff;
+
+ ah->phase++;
+ switch (ah->phase)
{
case AUTO_INIT:
GNUNET_assert (0);
break;
case AUTO_ONLINE:
- test_online (ac);
+ test_online (ah);
break;
case AUTO_EXTERNAL_IP:
- test_external_ip (ac);
+ test_external_ip (ah);
break;
case AUTO_LOCAL_IP:
- test_local_ip (ac);
+ test_local_ip (ah);
break;
case AUTO_NAT_PUNCHED:
- test_nat_punched (ac);
+ test_nat_punched (ah);
break;
case AUTO_UPNPC:
- test_upnpc (ac);
+ test_upnpc (ah);
break;
case AUTO_ICMP_SERVER:
- test_icmp_server (ac);
+ test_icmp_server (ah);
break;
case AUTO_ICMP_CLIENT:
- test_icmp_client (ac);
+ test_icmp_client (ah);
break;
case AUTO_DONE:
- ac->fin_cb (ac->fin_cb_cls);
- GNUNET_free (ac);
+ diff = GNUNET_CONFIGURATION_get_diff (ah->initial_cfg,
+ ah->cfg);
+ ah->fin_cb (ah->fin_cb_cls,
+ diff,
+ ah->ret);
+ GNUNET_CONFIGURATION_destroy (diff);
+ GNUNET_NAT_autoconfig_cancel (ah);
return;
}
}
-
/**
* Start auto-configuration routine. The resolver service should
* be available when this function is called.
*
* @param cfg initial configuration
* @param cb function to call with autoconfiguration result
- * @param cb_cls closure for cb
+ * @param cb_cls closure for @a cb
* @return handle to cancel operation
*/
struct GNUNET_NAT_AutoHandle *
GNUNET_NAT_AutoResultCallback cb,
void *cb_cls)
{
- struct GNUNET_NAT_AutoHandle *ac;
+ struct GNUNET_NAT_AutoHandle *ah;
- ac = GNUNET_malloc (sizeof (struct GNUNET_NAT_AutoHandle));
- ac->fin_cb = cb;
- ac->fin_cb_cls = cb_cls;
- ac->cfg = GNUNET_CONFIGURATION_dup (cfg);
- ac->init_cfg = GNUNET_CONFIGURATION_dup (cfg);
+ ah = GNUNET_new (struct GNUNET_NAT_AutoHandle);
+ ah->fin_cb = cb;
+ ah->fin_cb_cls = cb_cls;
+ ah->ret = GNUNET_NAT_ERROR_SUCCESS;
+ ah->cfg = GNUNET_CONFIGURATION_dup (cfg);
+ ah->initial_cfg = GNUNET_CONFIGURATION_dup (cfg);
/* never use loopback addresses if user wanted autoconfiguration */
- GNUNET_CONFIGURATION_set_value_string (ac->cfg, "nat",
- "USE_LOCALADDR",
+ GNUNET_CONFIGURATION_set_value_string (ah->cfg, "nat",
+ "USE_LOCALADDR",
"NO");
- next_phase (ac);
- return ac;
+ next_phase (ah);
+ return ah;
}
-
/**
* Abort autoconfiguration.
void
GNUNET_NAT_autoconfig_cancel (struct GNUNET_NAT_AutoHandle *ah)
{
+ if (NULL != ah->tst)
+ {
+ GNUNET_NAT_test_stop (ah->tst);
+ ah->tst = NULL;
+ }
+ if (NULL != ah->eh)
+ {
+ GNUNET_NAT_mini_get_external_ipv4_cancel (ah->eh);
+ ah->eh = NULL;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != ah->task)
+ {
+ GNUNET_SCHEDULER_cancel (ah->task);
+ ah->task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_CONFIGURATION_destroy (ah->cfg);
+ GNUNET_CONFIGURATION_destroy (ah->initial_cfg);
+ GNUNET_free (ah);
}
-
/* end of nat_auto.c */
projects / oweals / gnunet.git / blobdiff