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"
/**
* 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;
-
- /**
- * The port to send this probe to, 0 to choose randomly
- */
- int port;
+ struct IPv4UdpAddress addr;
};
*/
char *internal_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;
if ((addr == NULL) || (addrlen == 0))
{
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp", _
("udp_real_send called without address, returning!\n"));
#endif
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;
+ const struct IPv4UdpAddress *t4;
- if (addrlen < sizeof (struct sockaddr))
- return;
- switch (sa->sa_family)
+ GNUNET_assert(addrlen == sizeof(struct IPv4UdpAddress));
+ t4 = (struct IPv4UdpAddress *)addr;
+
+ if (NULL == inet_ntop (AF_INET,
+ &t4->u_port,
+ addr_buf, INET_ADDRSTRLEN))
{
- 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_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
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
_("Running gnunet-nat-client with arguments: %s %s %d\n"), plugin->external_address, address_as_string, plugin->port);
#endif
const struct IPv4UdpAddress *t4;
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;
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
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
_("Other peer is NAT'd, set up peer session for peer %s\n"), GNUNET_i2s(target));
#endif
}
+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.
if (af == AF_INET)
{
t4.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
+ 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 (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));
+ 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);
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);
-
- 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);
-
+
+ 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);
return GNUNET_OK;
}
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
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
- _("Sending a probe to port %d\n"), ntohs(probe->sock_addr.sin_port));
+ _("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),
+ &probe->addr, sizeof(probe->addr),
&udp_probe_continuation, probe);
GNUNET_free(message);
if ((result == GNUNET_OK) && (probe->count < MAX_PROBES))
{
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
_("Scheduling next probe for 10000 milliseconds\n"));
#endif
}
else /* Destroy the probe context. */
{
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
_("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
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
_("Finished reading from server stdout with code: %d\n"), bytes);
#endif
return;
}
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
_("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",
{
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);
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
+#if DEBUG_UDP
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));
+ _("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);
+ (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
+#if DEBUG_UDP
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);
+ _("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
+#if DEBUG_UDP
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);
+ _("Received PROBE REPLY from port %d on incoming port %d\n"), incoming_port, sockinfo->port);
#endif
- if ((sender_addr != NULL) && (sizeof(sender_addr) == sizeof(struct IPv4UdpAddress)))
+ if (sizeof(sender_addr) == 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,
+ &((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
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
_("Sending confirmation that we were reached!\n"));
#endif
}
else
{
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp",
_("Received a probe reply, but have no record of a sent probe!\n"));
#endif
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_CONFIRM:
peer_session = find_session(plugin, sender);
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
_("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
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "udp",
_("Peer not in list, adding (THIS MAY BE A MISTAKE) %s\n"), GNUNET_i2s(sender));
#endif
{
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
+ 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_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));
+ _("Received a probe confirmation, will send to peer on port %d\n"), incoming_port);
#endif
if (peer_session->messages != NULL)
{
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp",
_("Received a probe confirmation, sending queued messages.\n"));
#endif
int count = 0;
while (pending_message != NULL)
{
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp",
_("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
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp",
_("finished sending queued message %d\n"), count);
#endif
}
else
{
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, "udp",
_("Received probe confirmation for already confirmed peer!\n"));
#endif
/* If we receive these just ignore! */
break;
default:
+#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);
}
GNUNET_NETWORK_socket_recvfrom (udp_sock.desc, buf, buflen,
(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;
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)
{
GNUNET_free (buf);
}
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);
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
offset += ntohs(currhdr->size);
count++;
}
plugin->server_stdout = GNUNET_DISK_pipe(GNUNET_YES);
if (plugin->server_stdout == NULL)
return sockets_created;
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"udp",
"Starting gnunet-nat-server process cmd: %s %s\n", "gnunet-nat-server", plugin->internal_address);
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)
{
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"udp",
"Failed to start gnunet-nat-server process\n");
serverAddrv4.sin_port = htons (plugin->port);
addrlen = sizeof (serverAddrv4);
serverAddr = (struct sockaddr *) &serverAddrv4;
-#if DEBUG_UDP_NAT
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"udp",
"Binding to port %d\n", ntohs(serverAddrv4.sin_port));
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));
+#if DEBUG_UDP
+ 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);
}
+
+/**
+ * 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
+ inet_ntop (af, sb, buf, INET6_ADDRSTRLEN);
+
+#if DEBUG_UDP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
"udp",
- "Informing transport service about my address `%s'.\n",
- GNUNET_a2s (addr, addrlen));
+ "Informing transport service about my address `%s:%u'\n",
+ buf,
+ port);
#endif
return GNUNET_OK;
}
{
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;
projects / oweals / gnunet.git / blobdiff