/*
This file is part of GNUnet.
- (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
* given in the configuration (i.e. hole-punched DynDNS setup).
*/
LAL_EXTERNAL_IP,
+
+ /**
+ * Address was obtained by an external STUN server
+ */
+ LAL_EXTERNAL_STUN_IP,
/**
* Address was obtained by DNS resolution of the external hostname
/**
* ID of select gnunet-helper-nat-server stdout read task
*/
- GNUNET_SCHEDULER_TaskIdentifier server_read_task;
+ struct GNUNET_SCHEDULER_Task * server_read_task;
/**
* ID of interface IP-scan task
*/
- GNUNET_SCHEDULER_TaskIdentifier ifc_task;
+ struct GNUNET_SCHEDULER_Task * ifc_task;
/**
* ID of hostname DNS lookup task
*/
- GNUNET_SCHEDULER_TaskIdentifier hostname_task;
+ struct GNUNET_SCHEDULER_Task * hostname_task;
/**
* ID of DynDNS lookup task
*/
- GNUNET_SCHEDULER_TaskIdentifier dns_task;
-
- /**
- * ID of task to add addresses from bind.
- */
- GNUNET_SCHEDULER_TaskIdentifier bind_task;
+ struct GNUNET_SCHEDULER_Task *dns_task;
/**
* How often do we scan for changes in our IP address from our local
return GNUNET_OK;
}
if ((h->internal_address == NULL) && (h->server_proc == NULL) &&
- (h->server_read_task == GNUNET_SCHEDULER_NO_TASK) &&
+ (h->server_read_task == NULL) &&
(GNUNET_YES == isDefault) && ((addr->sa_family == AF_INET) ||
(addr->sa_family == AF_INET6)))
{
{
struct GNUNET_NAT_Handle *h = cls;
- h->server_read_task = GNUNET_SCHEDULER_NO_TASK;
+ h->server_read_task = NULL;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
start_gnunet_nat_server (h);
const char *port_start;
struct sockaddr_in sin_addr;
- h->server_read_task = GNUNET_SCHEDULER_NO_TASK;
+ h->server_read_task = NULL;
if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
memset (mybuf, 0, sizeof (mybuf));
{
struct GNUNET_NAT_Handle *h = cls;
- h->ifc_task = GNUNET_SCHEDULER_NO_TASK;
+ h->ifc_task = NULL;
remove_from_address_list_by_source (h, LAL_INTERFACE_ADDRESS);
GNUNET_OS_network_interfaces_list (&process_interfaces, h);
h->ifc_task =
{
struct GNUNET_NAT_Handle *h = cls;
- h->hostname_task = GNUNET_SCHEDULER_NO_TASK;
+ h->hostname_task = NULL;
remove_from_address_list_by_source (h, LAL_HOSTNAME_DNS);
h->hostname_dns =
GNUNET_RESOLVER_hostname_resolve (AF_UNSPEC, HOSTNAME_RESOLVE_TIMEOUT,
struct GNUNET_NAT_Handle *h = cls;
struct LocalAddressList *pos;
- h->dns_task = GNUNET_SCHEDULER_NO_TASK;
+ h->dns_task = NULL;
for (pos = h->lal_head; NULL != pos; pos = pos->next)
if (pos->source == LAL_EXTERNAL_IP)
pos->source = LAL_EXTERNAL_IP_OLD;
_("Error while running upnp client:\n"));
//FIXME: convert error code to string
-
+
return;
}
-
+
if (GNUNET_YES == add_remove)
{
add_to_address_list (h, LAL_UPNP, addr, addrlen);
/**
* Task to add addresses from original bind to set of valid addrs.
*
- * @param cls the NAT handle
- * @param tc scheduler context
+ * @param h the NAT handle
*/
static void
-add_from_bind (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+add_from_bind (struct GNUNET_NAT_Handle *h)
{
static struct in6_addr any = IN6ADDR_ANY_INIT;
- struct GNUNET_NAT_Handle *h = cls;
+
unsigned int i;
struct sockaddr *sa;
const struct sockaddr_in *v4;
- h->bind_task = GNUNET_SCHEDULER_NO_TASK;
for (i = 0; i < h->num_local_addrs; i++)
{
sa = h->local_addrs[i];
}
v4 = (const struct sockaddr_in *) sa;
if (0 != v4->sin_addr.s_addr)
- add_to_address_list (h, LAL_BINDTO_ADDRESS, sa,
+ add_to_address_list (h,
+ LAL_BINDTO_ADDRESS, sa,
sizeof (struct sockaddr_in));
if (h->enable_upnp)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Running upnp client for address `%s'\n",
- GNUNET_a2s (sa,sizeof (struct sockaddr_in)));
+ "Running upnp client for address `%s'\n",
+ GNUNET_a2s (sa,sizeof (struct sockaddr_in)));
add_minis (h, ntohs (v4->sin_port));
}
break;
break;
}
if (0 !=
- memcmp (&((const struct sockaddr_in6 *) sa)->sin6_addr, &any,
+ memcmp (&((const struct sockaddr_in6 *) sa)->sin6_addr,
+ &any,
sizeof (struct in6_addr)))
- add_to_address_list (h, LAL_BINDTO_ADDRESS, sa,
+ add_to_address_list (h,
+ LAL_BINDTO_ADDRESS,
+ sa,
sizeof (struct sockaddr_in6));
break;
default:
}
-
/**
* Attempt to enable port redirection and detect public IP address contacting
* UPnP or NAT-PMP routers on the local network. Use addr to specify to which
* @param is_tcp #GNUNET_YES for TCP, #GNUNET_NO for UDP
* @param adv_port advertised port (port we are either bound to or that our OS
* locally performs redirection from to our bound port).
- * @param num_addrs number of addresses in 'addrs'
+ * @param num_addrs number of addresses in @a addrs
* @param addrs the local addresses packets should be redirected to
* @param addrlens actual lengths of the addresses
* @param address_callback function to call everytime the public IP address changes
uint16_t adv_port,
unsigned int num_addrs,
const struct sockaddr **addrs,
- const socklen_t * addrlens,
+ const socklen_t *addrlens,
GNUNET_NAT_AddressCallback address_callback,
GNUNET_NAT_ReversalCallback reversal_callback,
void *callback_cls)
memcpy (h->local_addrs[i], addrs[i], addrlens[i]);
}
}
- h->bind_task = GNUNET_SCHEDULER_add_now (&add_from_bind, h);
if (GNUNET_OK ==
GNUNET_CONFIGURATION_have_value (cfg, "nat", "INTERNAL_ADDRESS"))
{
if (NULL != h->address_callback)
{
- h->ifc_task = GNUNET_SCHEDULER_add_now (&list_interfaces, h);
+ h->ifc_task = GNUNET_SCHEDULER_add_now (&list_interfaces,
+ h);
if (GNUNET_YES == h->use_hostname)
- h->hostname_task = GNUNET_SCHEDULER_add_now (&resolve_hostname, h);
+ h->hostname_task = GNUNET_SCHEDULER_add_now (&resolve_hostname,
+ h);
}
+ add_from_bind (h);
return h;
}
"NAT unregister called\n");
while (NULL != (ml = h->mini_head))
{
- GNUNET_CONTAINER_DLL_remove (h->mini_head, h->mini_tail, ml);
+ GNUNET_CONTAINER_DLL_remove (h->mini_head,
+ h->mini_tail,
+ ml);
if (NULL != ml->mini)
GNUNET_NAT_mini_map_stop (ml->mini);
GNUNET_free (ml);
GNUNET_RESOLVER_request_cancel (h->hostname_dns);
h->hostname_dns = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != h->server_read_task)
+ if (NULL != h->server_read_task)
{
GNUNET_SCHEDULER_cancel (h->server_read_task);
- h->server_read_task = GNUNET_SCHEDULER_NO_TASK;
- }
- if (GNUNET_SCHEDULER_NO_TASK != h->bind_task)
- {
- GNUNET_SCHEDULER_cancel (h->bind_task);
- h->bind_task = GNUNET_SCHEDULER_NO_TASK;
+ h->server_read_task = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != h->ifc_task)
+ if (NULL != h->ifc_task)
{
GNUNET_SCHEDULER_cancel (h->ifc_task);
- h->ifc_task = GNUNET_SCHEDULER_NO_TASK;
+ h->ifc_task = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != h->hostname_task)
+ if (NULL != h->hostname_task)
{
GNUNET_SCHEDULER_cancel (h->hostname_task);
- h->hostname_task = GNUNET_SCHEDULER_NO_TASK;
+ h->hostname_task = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != h->dns_task)
+ if (NULL != h->dns_task)
{
GNUNET_SCHEDULER_cancel (h->dns_task);
- h->dns_task = GNUNET_SCHEDULER_NO_TASK;
+ h->dns_task = NULL;
}
if (NULL != h->server_proc)
{
/**
* Converts enum GNUNET_NAT_StatusCode to a string
- *
+ *
* @param err error code to resolve to a string
* @return pointer to a static string containing the error code
*/
projects / oweals / gnunet.git / blobdiff