GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
#include "platform.h"
#include "gnunet_hello_lib.h"
#include "gnunet_connection_lib.h"
+#include "gnunet_container_lib.h"
#include "gnunet_os_lib.h"
#include "gnunet_peerinfo_service.h"
#include "gnunet_protocols.h"
#include "gnunet_signatures.h"
#include "gnunet_statistics_service.h"
#include "gnunet_transport_service.h"
-#include "plugin_transport.h"
+#include "gnunet_transport_plugin.h"
#include "transport.h"
#define DEBUG_UDP GNUNET_YES
/**
* IPv4 address, in network byte order.
*/
- uint32_t ipv4_addr;
+ uint32_t ipv4_addr GNUNET_PACKED;
/**
* Port number, in network byte order.
*/
- uint16_t u_port;
+ uint16_t u_port GNUNET_PACKED;
};
/**
* IPv6 address.
*/
- unsigned char ipv6_addr[16];
+ struct in6_addr ipv6_addr GNUNET_PACKED;
/**
* Port number, in network byte order.
*/
- uint16_t u6_port;
+ uint16_t u6_port GNUNET_PACKED;
};
/* Forward definition */
};
+/**
+ * Local network addresses (actual IP address follows this struct).
+ * PORT is NOT included!
+ */
+struct LocalAddrList
+{
+
+ /**
+ * This is a doubly linked list.
+ */
+ struct LocalAddrList *next;
+
+ /**
+ * This is a doubly linked list.
+ */
+ struct LocalAddrList *prev;
+
+ /**
+ * Number of bytes of the address that follow
+ */
+ size_t size;
+
+};
+
/**
* UDP NAT "Session"
GNUNET_SCHEDULER_TaskIdentifier task;
/**
- * Network address (always ipv4)
+ * Network address (always ipv4!)
*/
- struct sockaddr_in sock_addr;
+ struct IPv4UdpAddress addr;
+
+};
+
+/**
+ * Information we keep for each of our listen sockets.
+ */
+struct UDP_Sock_Info
+{
/**
- * The port to send this probe to, 0 to choose randomly
+ * The network handle
*/
- int port;
+ struct GNUNET_NETWORK_Handle *desc;
+ /**
+ * The port we bound to
+ */
+ uint16_t port;
};
*/
char *internal_address;
- /*
+ /**
+ * Address we were told to bind to exclusively (IPv4).
+ */
+ char *bind_address;
+
+ /**
+ * Address we were told to bind to exclusively (IPv6).
+ */
+ char *bind6_address;
+
+ /**
+ * List of our IP addresses.
+ */
+ struct LocalAddrList *lal_head;
+
+ /**
+ * Tail of our IP address list.
+ */
+ struct LocalAddrList *lal_tail;
+
+ /**
* FD Read set
*/
struct GNUNET_NETWORK_FDSet *rs;
- /*
+ /**
* stdout pipe handle for the gnunet-nat-server process
*/
struct GNUNET_DISK_PipeHandle *server_stdout;
- /*
+ /**
* stdout file handle (for reading) for the gnunet-nat-server process
*/
const struct GNUNET_DISK_FileHandle *server_stdout_handle;
+ /**
+ * Probes in flight
+ */
+ struct UDP_NAT_Probes *probes;
+
+ /**
+ * socket that we transmit all IPv4 data with
+ */
+ struct UDP_Sock_Info udp_sockv4;
+
+ /**
+ * socket that we transmit all IPv6 data with
+ */
+ struct UDP_Sock_Info udp_sockv6;
+
/**
* ID of select gnunet-nat-server stdout read task
*/
/**
* The process id of the server process (if behind NAT)
*/
- pid_t server_pid;
-
- /**
- * Probes in flight
- */
- struct UDP_NAT_Probes *probes;
-
-};
+ struct GNUNET_OS_Process *server_proc;
-
-struct UDP_Sock_Info
-{
- /* The network handle */
- struct GNUNET_NETWORK_Handle *desc;
-
- /* The port we bound to */
- int port;
};
-/* *********** globals ************* */
-
-/**
- * the socket that we transmit all data with
- */
-static struct UDP_Sock_Info udp_sock;
-
/**
* Forward declaration.
udp_transport_server_stop (void *cls)
{
struct Plugin *plugin = cls;
- int ret;
- int ok;
- ret = 0;
if (plugin->select_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (plugin->env->sched, plugin->select_task);
+ GNUNET_SCHEDULER_cancel (plugin->select_task);
plugin->select_task = GNUNET_SCHEDULER_NO_TASK;
}
-
- ok = GNUNET_NETWORK_socket_close (udp_sock.desc);
- if (ok == GNUNET_OK)
- udp_sock.desc = NULL;
- ret += ok;
-
+ if (plugin->udp_sockv4.desc != NULL)
+ {
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->udp_sockv4.desc));
+ plugin->udp_sockv4.desc = NULL;
+ }
+ if (plugin->udp_sockv6.desc != NULL)
+ {
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (plugin->udp_sockv6.desc));
+ plugin->udp_sockv6.desc = NULL;
+ }
if (plugin->behind_nat == GNUNET_YES)
{
- if (0 != PLIBC_KILL (plugin->server_pid, SIGTERM))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- }
- GNUNET_OS_process_wait (plugin->server_pid);
+ if (0 != GNUNET_OS_process_kill (plugin->server_proc, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ GNUNET_OS_process_wait (plugin->server_proc);
+ GNUNET_OS_process_close (plugin->server_proc);
+ plugin->server_proc = NULL;
}
-
- if (ret != GNUNET_OK)
- return GNUNET_SYSERR;
- return ret;
+ return GNUNET_OK;
}
struct PeerSession *
-find_session (struct Plugin *plugin, const struct GNUNET_PeerIdentity *peer)
+find_session (struct Plugin *plugin,
+ const struct GNUNET_PeerIdentity *peer)
{
struct PeerSession *pos;
*/
static ssize_t
udp_real_send (void *cls,
- struct GNUNET_NETWORK_Handle *send_handle,
- const struct GNUNET_PeerIdentity *target,
- const char *msgbuf,
- size_t msgbuf_size,
- unsigned int priority,
- struct GNUNET_TIME_Relative timeout,
- const void *addr,
- size_t addrlen,
- GNUNET_TRANSPORT_TransmitContinuation cont,
- void *cont_cls)
+ struct GNUNET_NETWORK_Handle *send_handle,
+ const struct GNUNET_PeerIdentity *target,
+ const char *msgbuf,
+ size_t msgbuf_size,
+ unsigned int priority,
+ struct GNUNET_TIME_Relative timeout,
+ const void *addr,
+ size_t addrlen,
+ GNUNET_TRANSPORT_TransmitContinuation cont,
+ void *cont_cls)
{
struct Plugin *plugin = cls;
struct UDPMessage *message;
const void *sb;
size_t sbs;
+ if (send_handle == NULL)
+ {
+ /* failed to open send socket for AF */
+ if (cont != NULL)
+ cont (cont_cls, target, GNUNET_SYSERR);
+ return 0;
+ }
if ((addr == NULL) || (addrlen == 0))
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
- ("udp_real_send called without address, returning!\n"));
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "udp_real_send called without address, returning!\n");
#endif
if (cont != NULL)
cont (cont_cls, target, GNUNET_SYSERR);
GNUNET_NETWORK_socket_sendto (send_handle, message, ssize,
sb,
sbs);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "UDP transmit %u-byte message to %s (%d: %s)\n",
+ (unsigned int) ssize,
+ GNUNET_a2s (sb, sbs),
+ (int) sent,
+ (sent < 0) ? STRERROR (errno) : "ok");
if (cont != NULL)
{
if (sent == GNUNET_SYSERR)
void
run_gnunet_nat_client (struct Plugin *plugin, const char *addr, size_t addrlen)
{
- char inet4[INET_ADDRSTRLEN];
+ char addr_buf[INET_ADDRSTRLEN];
char *address_as_string;
char *port_as_string;
- pid_t pid;
- const struct sockaddr *sa = (const struct sockaddr *)addr;
+ struct GNUNET_OS_Process *proc;
+ const struct IPv4UdpAddress *t4;
- if (addrlen < sizeof (struct sockaddr))
- return;
- switch (sa->sa_family)
- {
- case AF_INET:
- if (addrlen != sizeof (struct sockaddr_in))
- return;
- if (NULL == inet_ntop (AF_INET,
- &((struct sockaddr_in *) sa)->sin_addr,
- inet4, INET_ADDRSTRLEN))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
- return;
- }
- address_as_string = GNUNET_strdup (inet4);
- break;
- case AF_INET6:
- default:
+ GNUNET_assert(addrlen == sizeof(struct IPv4UdpAddress));
+ t4 = (struct IPv4UdpAddress *)addr;
+
+ if (NULL == inet_ntop (AF_INET,
+ &t4->ipv4_addr,
+ addr_buf, INET_ADDRSTRLEN))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
return;
}
-
+ address_as_string = GNUNET_strdup (addr_buf);
GNUNET_asprintf(&port_as_string, "%d", plugin->port);
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Running gnunet-nat-client with arguments: %s %s %d\n"), plugin->external_address, address_as_string, plugin->port);
#endif
/* Start the server process */
- pid = GNUNET_OS_start_process(NULL, NULL, "gnunet-nat-client", "gnunet-nat-client", plugin->external_address, address_as_string, port_as_string, NULL);
+ proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-nat-client", "gnunet-nat-client", plugin->external_address, address_as_string, port_as_string, NULL);
GNUNET_free(address_as_string);
GNUNET_free(port_as_string);
- GNUNET_OS_process_wait (pid);
+ if (proc != NULL)
+ {
+ GNUNET_OS_process_wait (proc);
+ GNUNET_OS_process_close (proc);
+ proc = NULL;
+ }
}
/**
int other_peer_natd;
const struct IPv4UdpAddress *t4;
+ if (force_address == GNUNET_SYSERR)
+ return GNUNET_SYSERR;
GNUNET_assert (NULL == session);
- other_peer_natd = GNUNET_NO;
+ other_peer_natd = GNUNET_NO;
if (addrlen == sizeof(struct IPv4UdpAddress))
{
t4 = addr;
if (ntohs(t4->u_port) == 0)
other_peer_natd = GNUNET_YES;
}
- else if (addrlen == sizeof(struct IPv6UdpAddress))
- {
-
- }
- else
+ else if (addrlen != sizeof(struct IPv6UdpAddress))
{
GNUNET_break_op(0);
+ return -1; /* Must have an address to send to */
}
sent = 0;
-
if ((other_peer_natd == GNUNET_YES) && (plugin->allow_nat == GNUNET_YES))
{
peer_session = find_session(plugin, target);
peer_session->messages->timeout = GNUNET_TIME_relative_to_absolute(timeout);
peer_session->messages->cont = cont;
peer_session->messages->cont_cls = cont_cls;
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Other peer is NAT'd, set up peer session for peer %s\n"), GNUNET_i2s(target));
#endif
run_gnunet_nat_client(plugin, addr, addrlen);
{
if (peer_session->expecting_welcome == GNUNET_NO) /* We are "connected" */
{
- sent = udp_real_send(cls, peer_session->sock, target, msgbuf, msgbuf_size, priority, timeout, peer_session->connect_addr, peer_session->connect_alen, cont, cont_cls);
+ sent = udp_real_send(cls,
+ peer_session->sock,
+ target,
+ msgbuf, msgbuf_size,
+ priority, timeout,
+ peer_session->connect_addr, peer_session->connect_alen,
+ cont, cont_cls);
}
else /* Haven't gotten a response from this peer, queue message */
{
}
else if (other_peer_natd == GNUNET_NO) /* Other peer not behind a NAT, so we can just send the message as is */
{
- sent = udp_real_send(cls, udp_sock.desc, target, msgbuf, msgbuf_size, priority, timeout, addr, addrlen, cont, cont_cls);
+ sent = udp_real_send(cls,
+ (addrlen == sizeof (struct IPv4UdpAddress)) ? plugin->udp_sockv4.desc : plugin->udp_sockv6.desc,
+ target,
+ msgbuf, msgbuf_size,
+ priority, timeout, addr, addrlen,
+ cont, cont_cls);
}
else /* Other peer is NAT'd, but we don't want to play with them (or can't!) */
- return GNUNET_SYSERR;
+ {
+ return GNUNET_SYSERR;
+ }
/* When GNUNET_SYSERR is returned from udp_real_send, we will still call
* the callback so must not return GNUNET_SYSERR!
- * If we do, then transport context get freed twice. */
+ * If we did, then transport context would get freed twice. */
if (sent == GNUNET_SYSERR)
return 0;
-
return sent;
}
+static void
+add_to_address_list (struct Plugin *plugin,
+ const void *arg,
+ size_t arg_size)
+{
+ struct LocalAddrList *lal;
+
+ lal = plugin->lal_head;
+ while (NULL != lal)
+ {
+ if ( (lal->size == arg_size) &&
+ (0 == memcmp (&lal[1], arg, arg_size)) )
+ return;
+ lal = lal->next;
+ }
+ lal = GNUNET_malloc (sizeof (struct LocalAddrList) + arg_size);
+ lal->size = arg_size;
+ memcpy (&lal[1], arg, arg_size);
+ GNUNET_CONTAINER_DLL_insert (plugin->lal_head,
+ plugin->lal_tail,
+ lal);
+}
+
+
+static int
+check_local_addr (struct Plugin *plugin,
+ const void *arg,
+ size_t arg_size)
+{
+ struct LocalAddrList *lal;
+
+ lal = plugin->lal_head;
+ while (NULL != lal)
+ {
+ if ( (lal->size == arg_size) &&
+ (0 == memcmp (&lal[1], arg, arg_size)) )
+ return GNUNET_OK;
+ lal = lal->next;
+ }
+ return GNUNET_SYSERR;
+}
+
+
/**
* Add the IP of our network interface to the list of
* our external IP addresses.
struct IPv6UdpAddress t6;
void *arg;
uint16_t args;
-
void *addr_nat;
+ char buf[INET6_ADDRSTRLEN];
addr_nat = NULL;
af = addr->sa_family;
+
+ memset(buf, 0, INET6_ADDRSTRLEN);
if (af == AF_INET)
{
t4.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
+ GNUNET_assert(NULL != inet_ntop(AF_INET, &t4.ipv4_addr, &buf[0], INET_ADDRSTRLEN));
+ if ((plugin->bind6_address != NULL) || ((plugin->bind_address != NULL) && (0 != strcmp(buf, plugin->bind_address))))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Not notifying transport of address %s\n", "UDP", GNUNET_a2s (addr, addrlen));
+ return GNUNET_OK;
+ }
+ add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t));
if ((plugin->behind_nat == GNUNET_YES) && (plugin->only_nat_addresses == GNUNET_YES))
{
t4.u_port = htons (DEFAULT_NAT_PORT);
else if (plugin->behind_nat == GNUNET_YES) /* We are behind NAT, but will advertise NAT and normal addresses */
{
addr_nat = GNUNET_malloc(sizeof(t4));
+ t4.u_port = htons (DEFAULT_NAT_PORT);
memcpy(addr_nat, &t4, sizeof(t4));
t4.u_port = plugin->port;
- ((struct IPv4UdpAddress *)addr_nat)->u_port = htons(DEFAULT_NAT_PORT);
}
else
{
}
else if (af == AF_INET6)
{
-
if (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr))
{
/* skip link local addresses */
memcpy (&t6.ipv6_addr,
&((struct sockaddr_in6 *) addr)->sin6_addr,
sizeof (struct in6_addr));
+ GNUNET_assert(NULL != inet_ntop(AF_INET6, &t6.ipv6_addr, &buf[0], INET6_ADDRSTRLEN));
+ if (((plugin->bind_address != NULL) && (0 != strcmp(buf, plugin->bind_address)))
+ || ((plugin->bind6_address != NULL) && (0 != strcmp(buf, plugin->bind6_address))))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Not notifying transport of address %s\n", "UDP", GNUNET_a2s (addr, addrlen));
+ return GNUNET_OK;
+ }
+ add_to_address_list (plugin, &t6.ipv6_addr, sizeof (struct in6_addr));
if ((plugin->behind_nat == GNUNET_YES) && (plugin->only_nat_addresses == GNUNET_YES))
{
- t6.u6_port = htons (0);
+ t6.u6_port = htons (DEFAULT_NAT_PORT);
}
else if (plugin->behind_nat == GNUNET_YES)
{
addr_nat = GNUNET_malloc(sizeof(t6));
+ t6.u6_port = htons (DEFAULT_NAT_PORT);
memcpy(addr_nat, &t6, sizeof(t6));
t6.u6_port = plugin->port;
- ((struct IPv6UdpAddress *)addr_nat)->u6_port = htons(DEFAULT_NAT_PORT);
}
else
{
arg = &t6;
args = sizeof (t6);
}
+ else
+ {
+ GNUNET_break (0);
+ return GNUNET_OK;
+ }
- GNUNET_log (GNUNET_ERROR_TYPE_INFO |
- GNUNET_ERROR_TYPE_BULK,
- _("Found address `%s' (%s)\n"),
- GNUNET_a2s (addr, addrlen), name);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO |
+ GNUNET_ERROR_TYPE_BULK,
+ _("Found address `%s' (%s)\n"),
+ GNUNET_a2s (addr, addrlen), name);
- if (addr_nat != NULL)
- {
- plugin->env->notify_address (plugin->env->cls,
- "udp",
- addr_nat, args, GNUNET_TIME_UNIT_FOREVER_REL);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO |
- GNUNET_ERROR_TYPE_BULK,
- _("Found NAT address `%s' (%s)\n"),
- GNUNET_a2s (addr_nat, args), name);
- GNUNET_free(addr_nat);
- }
-
- plugin->env->notify_address (plugin->env->cls,
- "udp",
- arg, args, GNUNET_TIME_UNIT_FOREVER_REL);
+ if (addr_nat != NULL)
+ {
+ plugin->env->notify_address (plugin->env->cls,
+ "udp",
+ addr_nat, args, GNUNET_TIME_UNIT_FOREVER_REL);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO |
+ GNUNET_ERROR_TYPE_BULK,
+ _("Found NAT address `%s' (%s)\n"),
+ GNUNET_a2s (addr_nat, args), name);
+ GNUNET_free(addr_nat);
+ }
+ plugin->env->notify_address (plugin->env->cls,
+ "udp",
+ arg, args, GNUNET_TIME_UNIT_FOREVER_REL);
return GNUNET_OK;
}
send_udp_probe_message (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct UDP_NAT_Probes *probe = cls;
- struct UDP_NAT_ProbeMessage *message;
+ struct UDP_NAT_ProbeMessage message;
struct Plugin *plugin = probe->plugin;
- message = GNUNET_malloc(sizeof(struct UDP_NAT_ProbeMessage));
- message->header.size = htons(sizeof(struct UDP_NAT_ProbeMessage));
- message->header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE);
+ memset (&message, 0, sizeof (message));
+ message.header.size = htons(sizeof(struct UDP_NAT_ProbeMessage));
+ message.header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE);
/* If they gave us a port, use that. If not, try our port. */
- if (probe->port != 0)
- probe->sock_addr.sin_port = htons(probe->port);
- else
- probe->sock_addr.sin_port = htons(plugin->port);
+ if (ntohs(probe->addr.u_port) == 0)
+ probe->addr.u_port = htons(plugin->port);
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
- _("Sending a probe to port %d\n"), ntohs(probe->sock_addr.sin_port));
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Sending a probe to port %d\n"), ntohs(probe->addr.u_port));
#endif
-
probe->count++;
-
- udp_real_send(plugin, udp_sock.desc, NULL,
- (char *)message, ntohs(message->header.size), 0,
- GNUNET_TIME_relative_get_unit(),
- &probe->sock_addr, sizeof(probe->sock_addr),
- &udp_probe_continuation, probe);
-
- GNUNET_free(message);
+ udp_real_send(plugin,
+ plugin->udp_sockv4.desc,
+ NULL,
+ (char *)&message, ntohs(message.header.size), 0,
+ GNUNET_TIME_relative_get_unit(),
+ &probe->addr, sizeof(struct IPv4UdpAddress),
+ &udp_probe_continuation, probe);
}
udp_probe_continuation (void *cls, const struct GNUNET_PeerIdentity *target, int result)
{
struct UDP_NAT_Probes *probe = cls;
- struct Plugin *plugin = probe->plugin;
+ /*struct Plugin *plugin = probe->plugin;*/
if ((result == GNUNET_OK) && (probe->count < MAX_PROBES))
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Scheduling next probe for 10000 milliseconds\n"));
#endif
- probe->task = GNUNET_SCHEDULER_add_delayed(plugin->env->sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 10000), &send_udp_probe_message, probe);
+ probe->task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 10000), &send_udp_probe_message, probe);
}
else /* Destroy the probe context. */
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Sending probe didn't go well...\n"));
#endif
}
struct UDP_NAT_Probes *temp_probe;
int port;
char *port_start;
- struct sockaddr_in in_addr;
+ struct IPv4UdpAddress a4;
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
if (bytes < 1)
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Finished reading from server stdout with code: %d\n"), bytes);
#endif
return;
}
- port = 0;
port_start = NULL;
for (i = 0; i < sizeof(mybuf); i++)
{
else
{
plugin->server_read_task =
- GNUNET_SCHEDULER_add_read_file (plugin->env->sched,
- GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
plugin->server_stdout_handle, &udp_plugin_server_read, plugin);
return;
}
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("nat-server-read read: %s port %d\n"), &mybuf, port);
#endif
* We have received an ICMP response, ostensibly from a non-NAT'd peer
* that wants to connect to us! Send a message to establish a connection.
*/
- if (inet_pton(AF_INET, &mybuf[0], &in_addr.sin_addr) != 1)
+ if (inet_pton(AF_INET, &mybuf[0], &a4.ipv4_addr) != 1)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "udp",
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("nat-server-read malformed address\n"), &mybuf, port);
plugin->server_read_task =
- GNUNET_SCHEDULER_add_read_file (plugin->env->sched,
- GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
plugin->server_stdout_handle, &udp_plugin_server_read, plugin);
return;
}
{
temp_probe = GNUNET_malloc(sizeof(struct UDP_NAT_Probes));
temp_probe->address_string = strdup(&mybuf[0]);
- temp_probe->sock_addr.sin_family = AF_INET;
- GNUNET_assert(inet_pton(AF_INET, &mybuf[0], &temp_probe->sock_addr.sin_addr) == 1);
- temp_probe->port = port;
+ GNUNET_assert (1 == inet_pton(AF_INET, &mybuf[0], &temp_probe->addr.ipv4_addr));
+ temp_probe->addr.u_port = htons(port);
temp_probe->next = plugin->probes;
temp_probe->plugin = plugin;
- temp_probe->task = GNUNET_SCHEDULER_add_delayed(plugin->env->sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 500), &send_udp_probe_message, temp_probe);
+ temp_probe->task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 500), &send_udp_probe_message, temp_probe);
plugin->probes = temp_probe;
}
plugin->server_read_task =
- GNUNET_SCHEDULER_add_read_file (plugin->env->sched,
- GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
plugin->server_stdout_handle, &udp_plugin_server_read, plugin);
}
struct PeerSession *peer_session;
struct MessageQueue *pending_message;
struct MessageQueue *pending_message_temp;
+ uint16_t incoming_port;
if (memcmp(sender, plugin->env->my_identity, sizeof(struct GNUNET_PeerIdentity)) == 0)
{
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
_("Received a message from myself, dropping!!!\n"));
#endif
return;
}
+ incoming_port = 0;
+ GNUNET_assert(sender_addr != NULL); /* Can recvfrom have a NULL address? */
+ if (fromlen == sizeof(struct IPv4UdpAddress))
+ {
+ incoming_port = ntohs(((struct IPv4UdpAddress *)sender_addr)->u_port);
+ }
+ else if (fromlen == sizeof(struct IPv6UdpAddress))
+ {
+ incoming_port = ntohs(((struct IPv6UdpAddress *)sender_addr)->u6_port);
+ }
+
switch (ntohs(currhdr->type))
{
case GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE:
outgoing_probe_reply->header.size = htons(sizeof(struct UDP_NAT_ProbeMessageReply));
outgoing_probe_reply->header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_REPLY);
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
- _("Received a probe on listen port %d, sent_from port %d\n"), sockinfo->port, ntohs(((struct sockaddr_in *)sender_addr)->sin_port));
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Received a probe on listen port %d, sent_from port %d\n"),
+ sockinfo->port, incoming_port);
#endif
udp_real_send(plugin, sockinfo->desc, NULL,
- (char *)outgoing_probe_reply,
- ntohs(outgoing_probe_reply->header.size), 0,
- GNUNET_TIME_relative_get_unit(),
- sender_addr, fromlen,
- NULL, NULL);
-
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
- _("Sent PROBE REPLY to port %d on outgoing port %d\n"), ntohs(((struct sockaddr_in *)sender_addr)->sin_port), sockinfo->port);
+ (char *)outgoing_probe_reply,
+ ntohs(outgoing_probe_reply->header.size), 0,
+ GNUNET_TIME_relative_get_unit(),
+ sender_addr, fromlen,
+ NULL, NULL);
+
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Sent PROBE REPLY to port %d on outgoing port %d\n"),
+ incoming_port, sockinfo->port);
#endif
GNUNET_free(outgoing_probe_reply);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_REPLY:
/* Check for existing probe, check ports returned, send confirmation if all is well */
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
- _("Received PROBE REPLY from port %d on incoming port %d\n"), ntohs(((struct sockaddr_in *)sender_addr)->sin_port), sockinfo->port);
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Received PROBE REPLY from port %d on incoming port %d\n"), incoming_port, sockinfo->port);
#endif
- if (sizeof(sender_addr) == sizeof(struct IPv4UdpAddress))
+ if (fromlen == sizeof(struct IPv4UdpAddress))
{
memset(&addr_buf, 0, sizeof(addr_buf));
- if (NULL == inet_ntop (AF_INET,
- &((struct sockaddr_in *) sender_addr)->sin_addr, addr_buf,
+ if (NULL == inet_ntop (AF_INET,
+ &((struct IPv4UdpAddress *) sender_addr)->ipv4_addr, addr_buf,
INET_ADDRSTRLEN))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
outgoing_probe = find_probe(plugin, &addr_buf[0]);
if (outgoing_probe != NULL)
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
- _("Sending confirmation that we were reached!\n"));
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Sending confirmation that we were reached!\n"));
#endif
outgoing_probe_confirmation = GNUNET_malloc(sizeof(struct UDP_NAT_ProbeMessageConfirmation));
outgoing_probe_confirmation->header.size = htons(sizeof(struct UDP_NAT_ProbeMessageConfirmation));
outgoing_probe_confirmation->header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_CONFIRM);
-
- udp_real_send(plugin, sockinfo->desc, NULL, (char *)outgoing_probe_confirmation, ntohs(outgoing_probe_confirmation->header.size), 0, GNUNET_TIME_relative_get_unit(), sender_addr, fromlen, NULL, NULL);
+ udp_real_send(plugin, sockinfo->desc, NULL,
+ (char *)outgoing_probe_confirmation,
+ ntohs(outgoing_probe_confirmation->header.size), 0,
+ GNUNET_TIME_relative_get_unit(),
+ sender_addr, fromlen, NULL, NULL);
if (outgoing_probe->task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel(plugin->env->sched, outgoing_probe->task);
+ GNUNET_SCHEDULER_cancel(outgoing_probe->task);
outgoing_probe->task = GNUNET_SCHEDULER_NO_TASK;
/* Schedule task to timeout and remove probe if confirmation not received */
}
}
else
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp",
- _("Received a probe reply, but have no record of a sent probe!\n"));
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Received a probe reply, but have no record of a sent probe!\n"));
#endif
}
}
+ else
+ {
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Received a probe reply, but sender address size is WRONG (should be %d, is %d)!\n"), sizeof(struct IPv4UdpAddress), fromlen);
+#endif
+ }
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_CONFIRM:
peer_session = find_session(plugin, sender);
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
- _("Looking up peer session for peer %s\n"), GNUNET_i2s(sender));
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Looking up peer session for peer %s\n"), GNUNET_i2s(sender));
#endif
if (peer_session == NULL) /* Shouldn't this NOT happen? */
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
- _("Peer not in list, adding (THIS MAY BE A MISTAKE) %s\n"), GNUNET_i2s(sender));
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Peer not in list, adding (THIS MAY BE A MISTAKE) %s\n"), GNUNET_i2s(sender));
#endif
peer_session = GNUNET_malloc(sizeof(struct PeerSession));
peer_session->connect_addr = GNUNET_malloc(fromlen);
{
peer_session->expecting_welcome = GNUNET_NO;
peer_session->sock = sockinfo->desc;
- ((struct sockaddr_in *)peer_session->connect_addr)->sin_port = ((struct sockaddr_in *) sender_addr)->sin_port;
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp",
- _("Received a probe confirmation, will send to peer on port %d\n"), ntohs(((struct sockaddr_in *)peer_session->connect_addr)->sin_port));
+ if (peer_session->connect_alen == sizeof(struct IPv4UdpAddress))
+ {
+ ((struct IPv4UdpAddress *)peer_session->connect_addr)->u_port = htons(incoming_port);
+ }
+ else if (peer_session->connect_alen == sizeof(struct IPv4UdpAddress))
+ {
+ ((struct IPv6UdpAddress *)peer_session->connect_addr)->u6_port = htons(incoming_port);
+ }
+
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Received a probe confirmation, will send to peer on port %d\n"), incoming_port);
#endif
if (peer_session->messages != NULL)
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp",
- _("Received a probe confirmation, sending queued messages.\n"));
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Received a probe confirmation, sending queued messages.\n"));
#endif
pending_message = peer_session->messages;
int count = 0;
while (pending_message != NULL)
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp",
- _("sending queued message %d\n"), count);
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("sending queued message %d\n"), count);
#endif
- udp_real_send(plugin, peer_session->sock, &peer_session->target, pending_message->msgbuf, pending_message->msgbuf_size, 0, GNUNET_TIME_relative_get_unit(), peer_session->connect_addr, peer_session->connect_alen, pending_message->cont, pending_message->cont_cls);
+ udp_real_send(plugin,
+ peer_session->sock,
+ &peer_session->target,
+ pending_message->msgbuf,
+ pending_message->msgbuf_size, 0,
+ GNUNET_TIME_relative_get_unit(),
+ peer_session->connect_addr,
+ peer_session->connect_alen,
+ pending_message->cont,
+ pending_message->cont_cls);
+
pending_message_temp = pending_message;
pending_message = pending_message->next;
GNUNET_free(pending_message_temp->msgbuf);
GNUNET_free(pending_message_temp);
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp",
- _("finished sending queued message %d\n"), count);
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("finished sending queued message %d\n"), count);
#endif
count++;
}
}
else
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp",
- _("Received probe confirmation for already confirmed peer!\n"));
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Received probe confirmation for already confirmed peer!\n"));
#endif
}
/* Received confirmation, add peer with address/port specified */
/* If we receive these just ignore! */
break;
default:
- plugin->env->receive (plugin->env->cls, sender, currhdr, UDP_DIRECT_DISTANCE,
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message type %d to transport!\n",
+ ntohs(currhdr->type));
+#endif
+ plugin->env->receive (plugin->env->cls, sender, currhdr, UDP_DIRECT_DISTANCE,
NULL, sender_addr, fromlen);
}
*
*/
static void
-udp_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+udp_plugin_select (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Plugin *plugin = cls;
- char *buf;
+ char buf[65536];
struct UDPMessage *msg;
- struct GNUNET_PeerIdentity *sender;
- unsigned int buflen;
+ struct GNUNET_PeerIdentity sender;
socklen_t fromlen;
char addr[32];
ssize_t ret;
const struct sockaddr_in6 *s6;
const void *ca;
size_t calen;
-
+ struct UDP_Sock_Info *udp_sock;
plugin->select_task = GNUNET_SCHEDULER_NO_TASK;
-
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
-
- buf = NULL;
- sender = NULL;
-
- buflen = GNUNET_NETWORK_socket_recvfrom_amount (udp_sock.desc);
-
- if (buflen == GNUNET_NO)
- return;
-
- buf = GNUNET_malloc (buflen);
+ udp_sock = NULL;
+ if (GNUNET_NETWORK_fdset_isset (tc->read_ready,
+ plugin->udp_sockv4.desc))
+ udp_sock = &plugin->udp_sockv4;
+ else if (GNUNET_NETWORK_fdset_isset (tc->read_ready,
+ plugin->udp_sockv6.desc))
+ udp_sock = &plugin->udp_sockv6;
+ if (NULL == udp_sock)
+ {
+ GNUNET_break (0);
+ return;
+ }
fromlen = sizeof (addr);
memset (&addr, 0, sizeof(addr));
ret =
- GNUNET_NETWORK_socket_recvfrom (udp_sock.desc, buf, buflen,
+ GNUNET_NETWORK_socket_recvfrom (udp_sock->desc, buf, sizeof (buf),
(struct sockaddr *)&addr, &fromlen);
- if (fromlen == sizeof (struct sockaddr_in))
+ if (AF_INET == ((struct sockaddr *)addr)->sa_family)
{
s4 = (const struct sockaddr_in*) &addr;
t4.u_port = s4->sin_port;
ca = &t4;
calen = sizeof (t4);
}
- else if (fromlen == sizeof (struct sockaddr_in6))
+ else if (AF_INET6 == ((struct sockaddr *)addr)->sa_family)
{
s6 = (const struct sockaddr_in6*) &addr;
t6.u6_port = s6->sin6_port;
ca = NULL;
calen = 0;
}
-
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
- ("socket_recv returned %u, src_addr_len is %u\n"), ret,
- fromlen);
-#endif
-
- if (ret <= 0)
+ if (ret < sizeof (struct UDPMessage))
{
- GNUNET_free (buf);
+ GNUNET_break_op (0);
+ plugin->select_task =
+ GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ GNUNET_SCHEDULER_NO_TASK,
+ GNUNET_TIME_UNIT_FOREVER_REL, plugin->rs,
+ NULL, &udp_plugin_select, plugin);
return;
}
msg = (struct UDPMessage *) buf;
-
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
- ("header reports message size of %d, type %d\n"),
- ntohs (msg->header.size), ntohs (msg->header.type));
-#endif
if (ntohs (msg->header.size) < sizeof (struct UDPMessage))
{
- GNUNET_free (buf);
+ GNUNET_break_op (0);
+ plugin->select_task =
+ GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ GNUNET_SCHEDULER_NO_TASK,
+ GNUNET_TIME_UNIT_FOREVER_REL, plugin->rs,
+ NULL, &udp_plugin_select, plugin);
return;
}
-
msgbuf = (char *)&msg[1];
- sender = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
- memcpy (sender, &msg->sender, sizeof (struct GNUNET_PeerIdentity));
-
+ memcpy (&sender, &msg->sender, sizeof (struct GNUNET_PeerIdentity));
offset = 0;
count = 0;
tsize = ntohs (msg->header.size) - sizeof(struct UDPMessage);
-
while (offset < tsize)
{
currhdr = (struct GNUNET_MessageHeader *)&msgbuf[offset];
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
- ("processing msg %d: type %d, size %d at offset %d\n"),
- count, ntohs(currhdr->type), ntohs(currhdr->size), offset);
-#endif
- udp_demultiplexer(plugin, sender, currhdr, ca, calen, &udp_sock);
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
- ("processing done msg %d: type %d, size %d at offset %d\n"),
- count, ntohs(currhdr->type), ntohs(currhdr->size), offset);
-#endif
+ udp_demultiplexer(plugin, &sender, currhdr, ca, calen, udp_sock);
offset += ntohs(currhdr->size);
count++;
}
- GNUNET_free_non_null (buf);
- GNUNET_free_non_null (sender);
-
-
plugin->select_task =
- GNUNET_SCHEDULER_add_select (plugin->env->sched,
- GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_UNIT_FOREVER_REL, plugin->rs,
NULL, &udp_plugin_select, plugin);
}
/**
- * Create a slew of UDP sockets. If possible, use IPv6, otherwise
- * try IPv4.
+ * Create a slew of UDP sockets. If possible, use IPv6 and IPv4.
*
* @param cls closure for server start, should be a struct Plugin *
- *
* @return number of sockets created or GNUNET_SYSERR on error
- */
+*/
static int
udp_transport_server_start (void *cls)
{
struct sockaddr *serverAddr;
socklen_t addrlen;
int sockets_created;
+ int tries;
- sockets_created = 0;
+ sockets_created = 0;
if (plugin->behind_nat == GNUNET_YES)
{
/* Pipe to read from started processes stdout (on read end) */
- plugin->server_stdout = GNUNET_DISK_pipe(GNUNET_YES);
+ plugin->server_stdout = GNUNET_DISK_pipe(GNUNET_YES, GNUNET_NO, GNUNET_YES);
if (plugin->server_stdout == NULL)
return sockets_created;
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "udp",
- "Starting gnunet-nat-server process cmd: %s %s\n", "gnunet-nat-server", plugin->internal_address);
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting gnunet-nat-server process cmd: %s %s\n",
+ "gnunet-nat-server",
+ plugin->internal_address);
#endif
/* Start the server process */
- plugin->server_pid = GNUNET_OS_start_process(NULL, plugin->server_stdout, "gnunet-nat-server", "gnunet-nat-server", plugin->internal_address, NULL);
- if (plugin->server_pid == GNUNET_SYSERR)
+ plugin->server_proc = GNUNET_OS_start_process(NULL,
+ plugin->server_stdout,
+ "gnunet-nat-server",
+ "gnunet-nat-server",
+ plugin->internal_address, NULL);
+ if (plugin->server_proc == NULL)
{
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "udp",
- "Failed to start gnunet-nat-server process\n");
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to start gnunet-nat-server process\n");
#endif
return GNUNET_SYSERR;
}
plugin->server_stdout_handle = GNUNET_DISK_pipe_handle(plugin->server_stdout, GNUNET_DISK_PIPE_END_READ);
plugin->server_read_task =
- GNUNET_SCHEDULER_add_read_file (plugin->env->sched,
- GNUNET_TIME_UNIT_FOREVER_REL,
- plugin->server_stdout_handle, &udp_plugin_server_read, plugin);
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+ plugin->server_stdout_handle, &udp_plugin_server_read, plugin);
}
- udp_sock.desc = NULL;
-
-
- udp_sock.desc = GNUNET_NETWORK_socket_create (PF_INET, SOCK_DGRAM, 17);
- if (NULL == udp_sock.desc)
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp", "socket");
- return sockets_created;
- }
- else
- {
- memset (&serverAddrv4, 0, sizeof (serverAddrv4));
-#if HAVE_SOCKADDR_IN_SIN_LEN
- serverAddrv4.sin_len = sizeof (serverAddrv4);
-#endif
- serverAddrv4.sin_family = AF_INET;
- serverAddrv4.sin_addr.s_addr = INADDR_ANY;
- serverAddrv4.sin_port = htons (plugin->port);
- addrlen = sizeof (serverAddrv4);
- serverAddr = (struct sockaddr *) &serverAddrv4;
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "udp",
- "Binding to port %d\n", ntohs(serverAddrv4.sin_port));
-#endif
- while (GNUNET_NETWORK_socket_bind (udp_sock.desc, serverAddr, addrlen) !=
- GNUNET_OK)
- {
- serverAddrv4.sin_port = htons (GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); /* Find a good, non-root port */
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "udp",
- "Binding failed, trying new port %d\n", ntohs(serverAddrv4.sin_port));
-#endif
- }
- udp_sock.port = ntohs(serverAddrv4.sin_port);
- sockets_created++;
- }
-
-
- if ((udp_sock.desc == NULL) && (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, "GNUNETD",
- "DISABLE-IPV6")))
+ if ( (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, "transport-udp",
+ "DISABLEV6")))
{
- udp_sock.desc = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_DGRAM, 17);
- if (udp_sock.desc != NULL)
- {
+ plugin->udp_sockv6.desc = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_DGRAM, 0);
+ if (NULL == plugin->udp_sockv6.desc)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp", "socket");
+ }
+ else
+ {
memset (&serverAddrv6, 0, sizeof (serverAddrv6));
#if HAVE_SOCKADDR_IN_SIN_LEN
serverAddrv6.sin6_len = sizeof (serverAddrv6);
#endif
+
serverAddrv6.sin6_family = AF_INET6;
serverAddrv6.sin6_addr = in6addr_any;
+ if (plugin->bind6_address != NULL)
+ {
+ if (1 != inet_pton(AF_INET6, plugin->bind6_address, &serverAddrv6.sin6_addr))
+ return 0;
+ }
+
serverAddrv6.sin6_port = htons (plugin->port);
addrlen = sizeof (serverAddrv6);
serverAddr = (struct sockaddr *) &serverAddrv6;
- sockets_created++;
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Binding to IPv6 port %d\n",
+ ntohs(serverAddrv6.sin6_port));
+#endif
+ tries = 0;
+ while (GNUNET_NETWORK_socket_bind (plugin->udp_sockv6.desc, serverAddr, addrlen) !=
+ GNUNET_OK)
+ {
+ serverAddrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); /* Find a good, non-root port */
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "IPv6 Binding failed, trying new port %d\n",
+ ntohs(serverAddrv6.sin6_port));
+#endif
+ tries++;
+ if (tries > 10)
+ {
+ GNUNET_NETWORK_socket_close (plugin->udp_sockv6.desc);
+ plugin->udp_sockv6.desc = NULL;
+ break;
+ }
+ }
+ if (plugin->udp_sockv6.desc != NULL)
+ {
+ plugin->udp_sockv6.port = ntohs(serverAddrv6.sin6_port);
+ sockets_created++;
+ }
+ }
+ }
+
+ plugin->udp_sockv4.desc = GNUNET_NETWORK_socket_create (PF_INET, SOCK_DGRAM, 0);
+ if (NULL == plugin->udp_sockv4.desc)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "socket");
+ }
+ else
+ {
+ memset (&serverAddrv4, 0, sizeof (serverAddrv4));
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ serverAddrv4.sin_len = sizeof (serverAddrv4);
+#endif
+ serverAddrv4.sin_family = AF_INET;
+ serverAddrv4.sin_addr.s_addr = INADDR_ANY;
+ if (plugin->bind_address != NULL)
+ {
+ if (1 != inet_pton(AF_INET, plugin->bind_address, &serverAddrv4.sin_addr))
+ return 0;
}
+ serverAddrv4.sin_port = htons (plugin->port);
+ addrlen = sizeof (serverAddrv4);
+ serverAddr = (struct sockaddr *) &serverAddrv4;
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Binding to IPv4 port %d\n",
+ ntohs(serverAddrv4.sin_port));
+#endif
+ tries = 0;
+ while (GNUNET_NETWORK_socket_bind (plugin->udp_sockv4.desc, serverAddr, addrlen) !=
+ GNUNET_OK)
+ {
+ serverAddrv4.sin_port = htons (GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000); /* Find a good, non-root port */
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "IPv4 Binding failed, trying new port %d\n",
+ ntohs(serverAddrv4.sin_port));
+#endif
+ tries++;
+ if (tries > 10)
+ {
+ GNUNET_NETWORK_socket_close (plugin->udp_sockv4.desc);
+ plugin->udp_sockv4.desc = NULL;
+ break;
+ }
+ }
+ if (plugin->udp_sockv4.desc != NULL)
+ {
+ plugin->udp_sockv4.port = ntohs(serverAddrv4.sin_port);
+ sockets_created++;
+ }
}
plugin->rs = GNUNET_NETWORK_fdset_create ();
-
GNUNET_NETWORK_fdset_zero (plugin->rs);
-
-
- GNUNET_NETWORK_fdset_set (plugin->rs, udp_sock.desc);
+ if (NULL != plugin->udp_sockv4.desc)
+ GNUNET_NETWORK_fdset_set (plugin->rs,
+ plugin->udp_sockv4.desc);
+ if (NULL != plugin->udp_sockv6.desc)
+ GNUNET_NETWORK_fdset_set (plugin->rs,
+ plugin->udp_sockv6.desc);
plugin->select_task =
- GNUNET_SCHEDULER_add_select (plugin->env->sched,
- GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
GNUNET_SCHEDULER_NO_TASK,
GNUNET_TIME_UNIT_FOREVER_REL, plugin->rs,
NULL, &udp_plugin_select, plugin);
-
return sockets_created;
}
+
+/**
+ * Check if the given port is plausible (must be either
+ * our listen port or our advertised port). If it is
+ * neither, we return GNUNET_SYSERR.
+ *
+ * @param plugin global variables
+ * @param in_port port number to check
+ * @return GNUNET_OK if port is either open_port or adv_port
+ */
+static int
+check_port (struct Plugin *plugin, uint16_t in_port)
+{
+ if ( (plugin->behind_nat == GNUNET_YES) && (in_port == 0) )
+ return GNUNET_OK;
+ if ( (plugin->only_nat_addresses == GNUNET_YES) &&
+ (plugin->behind_nat == GNUNET_YES) )
+ return GNUNET_SYSERR; /* odd case... */
+ if (in_port == plugin->port)
+ return GNUNET_OK;
+ return GNUNET_SYSERR;
+}
+
+
/**
- * Another peer has suggested an address for this peer and transport
- * plugin. Check that this could be a valid address. This function
- * is not expected to 'validate' the address in the sense of trying to
- * connect to it but simply to see if the binary format is technically
- * legal for establishing a connection.
+ * Function that will be called to check if a binary address for this
+ * plugin is well-formed and corresponds to an address for THIS peer
+ * (as per our configuration). Naturally, if absolutely necessary,
+ * plugins can be a bit conservative in their answer, but in general
+ * plugins should make sure that the address does not redirect
+ * traffic to a 3rd party that might try to man-in-the-middle our
+ * traffic.
*
* @param cls closure, should be our handle to the Plugin
- * @param addr pointer to the address, may be modified (slightly)
+ * @param addr pointer to the address
* @param addrlen length of addr
* @return GNUNET_OK if this is a plausible address for this peer
* and transport, GNUNET_SYSERR if not
*
*/
static int
-udp_check_address (void *cls, void *addr, size_t addrlen)
+udp_check_address (void *cls,
+ const void *addr,
+ size_t addrlen)
{
struct Plugin *plugin = cls;
- char buf[sizeof (struct sockaddr_in6)];
-
- struct sockaddr_in *v4;
- struct sockaddr_in6 *v6;
+ char buf[INET6_ADDRSTRLEN];
+ const void *sb;
+ struct in_addr a4;
+ struct in6_addr a6;
+ int af;
+ uint16_t port;
+ struct IPv4UdpAddress *v4;
+ struct IPv6UdpAddress *v6;
- if ((addrlen != sizeof (struct sockaddr_in)) &&
- (addrlen != sizeof (struct sockaddr_in6)))
+ if ((addrlen != sizeof (struct IPv4UdpAddress)) &&
+ (addrlen != sizeof (struct IPv6UdpAddress)))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
- memcpy (buf, addr, sizeof (struct sockaddr_in6));
- if (addrlen == sizeof (struct sockaddr_in))
+
+ if (addrlen == sizeof (struct IPv4UdpAddress))
{
- v4 = (struct sockaddr_in *) buf;
- v4->sin_port = htons (plugin->port);
+ v4 = (struct IPv4UdpAddress *) addr;
+ if (GNUNET_OK !=
+ check_port (plugin, ntohs (v4->u_port)))
+ return GNUNET_SYSERR;
+ if (GNUNET_OK !=
+ check_local_addr (plugin, &v4->ipv4_addr, sizeof (uint32_t)))
+ return GNUNET_SYSERR;
+
+ af = AF_INET;
+ port = ntohs (v4->u_port);
+ memcpy (&a4, &v4->ipv4_addr, sizeof (a4));
+ sb = &a4;
}
else
{
- v6 = (struct sockaddr_in6 *) buf;
- v6->sin6_port = htons (plugin->port);
+ v6 = (struct IPv6UdpAddress *) addr;
+ if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+ if (GNUNET_OK !=
+ check_port (plugin, ntohs (v6->u6_port)))
+ return GNUNET_SYSERR;
+ if (GNUNET_OK !=
+ check_local_addr (plugin, &v6->ipv6_addr, sizeof (struct in6_addr)))
+ return GNUNET_SYSERR;
+
+ af = AF_INET6;
+ port = ntohs (v6->u6_port);
+ memcpy (&a6, &v6->ipv6_addr, sizeof (a6));
+ sb = &a6;
}
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "udp",
- "Informing transport service about my address `%s'.\n",
- GNUNET_a2s (addr, addrlen));
+ inet_ntop (af, sb, buf, INET6_ADDRSTRLEN);
+
+#if DEBUG_UDP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Informing transport service about my address `%s:%u'\n",
+ buf,
+ port);
#endif
return GNUNET_OK;
}
void *asc_cls)
{
struct Plugin *plugin = cls;
- const struct sockaddr_in *v4;
- const struct sockaddr_in6 *v6;
struct PrettyPrinterContext *ppc;
+ const void *sb;
+ size_t sbs;
+ struct sockaddr_in a4;
+ struct sockaddr_in6 a6;
+ const struct IPv4UdpAddress *u4;
+ const struct IPv6UdpAddress *u6;
+ uint16_t port;
- if ((addrlen != sizeof (struct sockaddr_in)) &&
- (addrlen != sizeof (struct sockaddr_in6)))
+ if (addrlen == sizeof (struct IPv6UdpAddress))
+ {
+ u6 = addr;
+ memset (&a6, 0, sizeof (a6));
+ a6.sin6_family = AF_INET6;
+ a6.sin6_port = u6->u6_port;
+ memcpy (&a6.sin6_addr,
+ &u6->ipv6_addr,
+ sizeof (struct in6_addr));
+ port = ntohs (u6->u6_port);
+ sb = &a6;
+ sbs = sizeof (a6);
+ }
+ else if (addrlen == sizeof (struct IPv4UdpAddress))
+ {
+ u4 = addr;
+ memset (&a4, 0, sizeof (a4));
+ a4.sin_family = AF_INET;
+ a4.sin_port = u4->u_port;
+ a4.sin_addr.s_addr = u4->ipv4_addr;
+ port = ntohs (u4->u_port);
+ sb = &a4;
+ sbs = sizeof (a4);
+ }
+ else
{
/* invalid address */
GNUNET_break_op (0);
ppc = GNUNET_malloc (sizeof (struct PrettyPrinterContext));
ppc->asc = asc;
ppc->asc_cls = asc_cls;
- if (addrlen == sizeof (struct sockaddr_in))
- {
- v4 = (const struct sockaddr_in *) addr;
- ppc->port = ntohs (v4->sin_port);
- }
- else
- {
- v6 = (const struct sockaddr_in6 *) addr;
- ppc->port = ntohs (v6->sin6_port);
-
- }
- GNUNET_RESOLVER_hostname_get (plugin->env->sched,
- plugin->env->cfg,
- addr,
- addrlen,
+ ppc->port = port;
+ GNUNET_RESOLVER_hostname_get (plugin->env->cfg,
+ sb,
+ sbs,
!numeric, timeout, &append_port, ppc);
}
buf = GNUNET_malloc (strlen (path) + 20);
pos = path;
- while (NULL != (end = strchr (pos, ':')))
+ while (NULL != (end = strchr (pos, PATH_SEPARATOR)))
{
*end = '\0';
sprintf (buf, "%s/%s", pos, binary);
{
struct stat statbuf;
char *p;
+#ifdef MINGW
+ SOCKET rawsock;
+#endif
+#ifdef MINGW
+ char *binaryexe;
+ GNUNET_asprintf (&binaryexe, "%s.exe", binary);
+ p = get_path_from_PATH (binaryexe);
+ free (binaryexe);
+#else
p = get_path_from_PATH (binary);
+#endif
if (p == NULL)
return GNUNET_NO;
if (0 != STAT (p, &statbuf))
return GNUNET_SYSERR;
}
GNUNET_free (p);
+#ifndef MINGW
if ( (0 != (statbuf.st_mode & S_ISUID)) &&
(statbuf.st_uid == 0) )
return GNUNET_YES;
return GNUNET_NO;
+#else
+ rawsock = socket (AF_INET, SOCK_RAW, IPPROTO_ICMP);
+ if (INVALID_SOCKET == rawsock)
+ {
+ DWORD err = GetLastError ();
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "socket (AF_INET, SOCK_RAW, IPPROTO_ICMP) have failed! GLE = %d\n", err);
+ return GNUNET_NO; /* not running as administrator */
+ }
+ closesocket (rawsock);
+ return GNUNET_YES;
+#endif
}
/**
char *external_address;
struct IPv4UdpAddress v4_address;
- service = GNUNET_SERVICE_start ("transport-udp", env->sched, env->cfg);
+ service = GNUNET_SERVICE_start ("transport-udp", env->cfg);
if (service == NULL)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "udp", _
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _
("Failed to start service for `%s' transport plugin.\n"),
"udp");
return NULL;
else
{
behind_nat = GNUNET_NO;
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "udp", "Configuration specified you are behind a NAT, but gnunet-nat-server is not installed properly (suid bit not set)!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Configuration specified you are behind a NAT, but gnunet-nat-server is not installed properly (suid bit not set)!\n");
}
}
else
else
{
allow_nat = GNUNET_NO;
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "udp", "Configuration specified you want to connect to NAT'd peers, but gnunet-nat-client is not installed properly (suid bit not set)!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Configuration specified you want to connect to NAT'd peers, but gnunet-nat-client is not installed properly (suid bit not set)!\n");
}
}
"EXTERNAL_ADDRESS",
&external_address)))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "udp",
- _
- ("Require EXTERNAL_ADDRESS for service `%s' in configuration (either BEHIND_NAT or ALLOW_NAT set to YES)!\n"),
- "transport-udp");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Require EXTERNAL_ADDRESS for service `%s' in configuration (either BEHIND_NAT or ALLOW_NAT set to YES)!\n"),
+ "transport-udp");
GNUNET_SERVICE_stop (service);
return NULL;
}
if ((external_address != NULL) && (inet_pton(AF_INET, external_address, &v4_address.ipv4_addr) != 1))
{
- GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING, "udp", "Malformed EXTERNAL_ADDRESS %s given in configuration!\n", external_address);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Malformed EXTERNAL_ADDRESS %s given in configuration!\n", external_address);
}
internal_address = NULL;
"INTERNAL_ADDRESS",
&internal_address)))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "udp",
- _
- ("Require INTERNAL_ADDRESS for service `%s' in configuration!\n"),
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Require INTERNAL_ADDRESS for service `%s' in configuration!\n"),
"transport-udp");
GNUNET_SERVICE_stop (service);
GNUNET_free_non_null(external_address);
if ((internal_address != NULL) && (inet_pton(AF_INET, internal_address, &v4_address.ipv4_addr) != 1))
{
- GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING, "udp", "Malformed INTERNAL_ADDRESS %s given in configuration!\n", internal_address);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Malformed INTERNAL_ADDRESS %s given in configuration!\n", internal_address);
}
if (GNUNET_OK !=
port = UDP_NAT_DEFAULT_PORT;
else if (port > 65535)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
- "udp",
- _("Given `%s' option is out of range: %llu > %u\n"),
- "PORT",
- port,
- 65535);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Given `%s' option is out of range: %llu > %u\n"),
+ "PORT",
+ port,
+ 65535);
GNUNET_SERVICE_stop (service);
GNUNET_free_non_null(external_address);
GNUNET_free_non_null(internal_address);
- return NULL;
+ return NULL;
}
mtu = 1240;
if (mtu < 1200)
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
- "udp",
- _("MTU %llu for `%s' is probably too low!\n"), mtu,
- "UDP");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("MTU %llu for `%s' is probably too low!\n"), mtu,
+ "UDP");
plugin = GNUNET_malloc (sizeof (struct Plugin));
plugin->external_address = external_address;
plugin->service = service;
+ if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string(env->cfg, "transport-udp", "BINDTO", &plugin->bind_address))
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Binding udp plugin to specific address: `%s'\n", plugin->bind_address);
+ if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string(env->cfg, "transport-udp", "BINDTO6", &plugin->bind6_address))
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Binding udp plugin to specific address: `%s'\n", plugin->bind6_address);
+
if (plugin->behind_nat == GNUNET_NO)
{
GNUNET_OS_network_interfaces_list (&process_interfaces, plugin);
}
- plugin->hostname_dns = GNUNET_RESOLVER_hostname_resolve (env->sched,
- env->cfg,
+ plugin->hostname_dns = GNUNET_RESOLVER_hostname_resolve (env->cfg,
AF_UNSPEC,
HOSTNAME_RESOLVE_TIMEOUT,
&process_hostname_ips,
plugin->env->notify_address (plugin->env->cls,
"udp",
&v4_address, sizeof(v4_address), GNUNET_TIME_UNIT_FOREVER_REL);
+ add_to_address_list (plugin, &v4_address.ipv4_addr, sizeof (uint32_t));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Notifying plugin of address %s:0\n", plugin->external_address);
}
else if ((plugin->external_address != NULL) && (inet_pton(AF_INET, plugin->external_address, &v4_address.ipv4_addr) == 1))
{
plugin->env->notify_address (plugin->env->cls,
"udp",
&v4_address, sizeof(v4_address), GNUNET_TIME_UNIT_FOREVER_REL);
+ add_to_address_list (plugin, &v4_address.ipv4_addr, sizeof (uint32_t));
}
sockets_created = udp_transport_server_start (plugin);
-
- GNUNET_assert (sockets_created == 1);
-
+ if (sockets_created == 0)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to open UDP sockets\n"));
return api;
}
{
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
+ struct LocalAddrList *lal;
udp_transport_server_stop (plugin);
if (NULL != plugin->hostname_dns)
GNUNET_SERVICE_stop (plugin->service);
GNUNET_NETWORK_fdset_destroy (plugin->rs);
+ while (NULL != (lal = plugin->lal_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (plugin->lal_head,
+ plugin->lal_tail,
+ lal);
+ GNUNET_free (lal);
+ }
GNUNET_free (plugin);
GNUNET_free (api);
return NULL;