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
/**
* IPv4 address, in network byte order.
*/
- uint32_t ipv4_addr;
+ uint32_t ipv4_addr GNUNET_PACKED;
/**
* Port number, in network byte order.
*/
- uint16_t t_port;
+ uint16_t t_port GNUNET_PACKED;
};
/**
* IPv6 address.
*/
- struct in6_addr ipv6_addr;
+ struct in6_addr ipv6_addr GNUNET_PACKED;
/**
* Port number, in network byte order.
*/
- uint16_t t6_port;
+ uint16_t t6_port GNUNET_PACKED;
};
struct Plugin;
+/**
+ * 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;
+
+};
+
+
/**
* Information kept for each message that is yet to
* be transmitted.
struct Session
{
+ /**
+ * API requirement.
+ */
+ struct SessionHeader header;
+
/**
* Stored in a linked list.
*/
*/
int inbound;
+ /**
+ * Was this session created using NAT traversal?
+ */
+ int is_nat;
+
};
*/
struct GNUNET_CONNECTION_Handle *lsock;
- /*
+ /**
* 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;
*/
char *internal_address;
+ /**
+ * Address given for us to bind to (ONLY).
+ */
+ char *bind_address;
+
+ /**
+ * List of our IP addresses.
+ */
+ struct LocalAddrList *lal_head;
+
+ /**
+ * Tail of our IP address list.
+ */
+ struct LocalAddrList *lal_tail;
+
/**
* ID of task used to update our addresses when one expires.
*/
};
+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;
+}
/**
* Function called for a quick conversion of the binary address to
- * a numeric address. Note that the caller must not free the
+ * a numeric address. Note that the caller must not free the
* address and that the next call to this function is allowed
* to override the address again.
*
* @param cls closure ('struct Plugin*')
* @param addr binary address
* @param addrlen length of the address
- * @return string representing the same address
+ * @return string representing the same address
*/
-static const char*
+static const char*
tcp_address_to_string (void *cls,
const void *addr,
size_t addrlen)
}
else
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
- _("Unexected address length: %u\n"),
- addrlen);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Unexpected address length: %u\n"),
+ addrlen);
GNUNET_break (0);
return NULL;
}
- inet_ntop (af, sb, buf, INET6_ADDRSTRLEN);
+ if (NULL == inet_ntop (af, sb, buf, INET6_ADDRSTRLEN))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
+ return NULL;
+ }
GNUNET_snprintf (rbuf,
sizeof (rbuf),
(af == AF_INET6) ? "[%s]:%u" : "%s:%u",
GNUNET_assert (client == NULL);
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Creating new session for peer `%4s'\n",
GNUNET_i2s (target));
#endif
ret = GNUNET_malloc (sizeof (struct Session));
ret->last_activity = GNUNET_TIME_absolute_get ();
ret->plugin = plugin;
+ ret->is_nat = is_nat;
if (is_nat != GNUNET_YES) /* If not a NAT WAIT conn, add it to global list */
{
ret->next = plugin->sessions;
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes currently in TCP buffers"),
pm->message_size,
- GNUNET_NO);
+ GNUNET_NO);
GNUNET_CONTAINER_DLL_insert (ret->pending_messages_head,
ret->pending_messages_tail,
pm);
if (buf == NULL)
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Timeout trying to transmit to peer `%4s', discarding message queue.\n",
GNUNET_i2s (&session->target));
#endif
session->pending_messages_tail,
pos);
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to transmit %u byte message to `%4s'.\n",
pos->message_size,
GNUNET_i2s (&session->target));
/* do this call before callbacks (so that if callbacks destroy
session, they have a chance to cancel actions done by this
call) */
- process_pending_messages (session);
+ process_pending_messages (session);
pid = session->target;
/* no do callbacks and do not use session again since
the callbacks may abort the session */
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes currently in TCP buffers"),
- (int64_t) ret,
- GNUNET_NO);
+ GNUNET_NO);
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes discarded by TCP (timeout)"),
ret,
- GNUNET_NO);
+ GNUNET_NO);
return 0;
}
/* copy all pending messages that would fit */
cbuf = buf;
hd = NULL;
tl = NULL;
- while (NULL != (pos = session->pending_messages_head))
+ while (NULL != (pos = session->pending_messages_head))
{
- if (ret + pos->message_size > size)
+ if (ret + pos->message_size > size)
break;
GNUNET_CONTAINER_DLL_remove (session->pending_messages_head,
session->pending_messages_tail,
pos);
GNUNET_assert (size >= pos->message_size);
+ /* FIXME: this memcpy can be up to 7% of our total runtime */
memcpy (cbuf, pos->msg, pos->message_size);
cbuf += pos->message_size;
ret += pos->message_size;
/* schedule 'continuation' before callbacks so that callbacks that
cancel everything don't cause us to use a session that no longer
exists... */
- process_pending_messages (session);
+ process_pending_messages (session);
session->last_activity = GNUNET_TIME_absolute_get ();
pid = session->target;
/* we'll now call callbacks that may cancel the session; hence
GNUNET_assert (hd == NULL);
GNUNET_assert (tl == NULL);
#if DEBUG_TCP > 1
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp", "Transmitting %u bytes\n", ret);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting %u bytes\n", ret);
#endif
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes currently in TCP buffers"),
- (int64_t) ret,
- GNUNET_NO);
+ GNUNET_NO);
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes transmitted via TCP"),
ret,
- GNUNET_NO);
+ GNUNET_NO);
return ret;
}
return;
if (NULL == (pm = session->pending_messages_head))
return;
+
session->transmit_handle
= GNUNET_SERVER_notify_transmit_ready (session->client,
pm->message_size,
struct PendingMessage *pm;
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Disconnecting from `%4s' at %s (session %p).\n",
GNUNET_i2s (&session->target),
(session->connect_addr != NULL) ?
tcp_address_to_string (session->plugin,
session->connect_addr,
- session->connect_alen) : "*",
+ session->connect_alen) : "*",
session);
#endif
/* remove from session list */
else
prev->next = session->next;
session->plugin->env->session_end (session->plugin->env->cls,
- &session->target,
- session);
+ &session->target,
+ session);
/* clean up state */
if (session->transmit_handle != NULL)
{
while (NULL != (pm = session->pending_messages_head))
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+
pm->transmit_cont != NULL
? "Could not deliver message to `%4s'.\n"
:
GNUNET_STATISTICS_update (session->plugin->env->stats,
gettext_noop ("# bytes currently in TCP buffers"),
- (int64_t) pm->message_size,
- GNUNET_NO);
+ GNUNET_NO);
GNUNET_STATISTICS_update (session->plugin->env->stats,
gettext_noop ("# bytes discarded by TCP (disconnect)"),
pm->message_size,
- GNUNET_NO);
+ GNUNET_NO);
GNUNET_CONTAINER_DLL_remove (session->pending_messages_head,
session->pending_messages_tail,
pm);
{
GNUNET_SCHEDULER_cancel (session->plugin->env->sched,
session->receive_delay_task);
- GNUNET_SERVER_receive_done (session->client,
- GNUNET_SYSERR);
+ if (session->client != NULL)
+ GNUNET_SERVER_receive_done (session->client,
+ GNUNET_SYSERR);
}
- GNUNET_SERVER_client_drop (session->client);
+ if (session->client != NULL)
+ GNUNET_SERVER_client_drop (session->client);
GNUNET_STATISTICS_update (session->plugin->env->stats,
gettext_noop ("# TCP sessions active"),
-1,
- GNUNET_NO);
+ GNUNET_NO);
GNUNET_free_non_null (session->connect_addr);
GNUNET_free (session);
}
/**
* Given two otherwise equivalent sessions, pick the better one.
- *
+ *
* @param s1 one session (also default)
* @param s2 other session
* @return "better" session (more active)
char *port_as_string;
pid_t pid;
const struct sockaddr *sa = (const struct sockaddr *)addr;
+
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("called run_gnunet_nat_client addrlen %d others are %d and %d\n"), addrlen, sizeof (struct sockaddr), sizeof (struct sockaddr_in));
#endif
case AF_INET:
if (addrlen != sizeof (struct sockaddr_in))
return;
- inet_ntop (AF_INET,
- &((struct sockaddr_in *) sa)->sin_addr,
- inet4, INET_ADDRSTRLEN);
+ 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:
GNUNET_asprintf(&port_as_string, "%d", plugin->adv_port);
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Running gnunet-nat-client with arguments: %s %s %d\n"), plugin->external_address, address_as_string, plugin->adv_port);
#endif
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes TCP was asked to transmit"),
msgbuf_size,
- GNUNET_NO);
+ GNUNET_NO);
/* FIXME: we could do this cheaper with a hash table
where we could restrict the iteration to entries that match
the target peer... */
{
cand_session = NULL;
next = plugin->sessions;
- while (NULL != (session = next))
+ while (NULL != (session = next))
{
next = session->next;
GNUNET_assert (session->client != NULL);
if (0 != memcmp (target,
- &session->target,
+ &session->target,
sizeof (struct GNUNET_PeerIdentity)))
continue;
if ( ( (GNUNET_SYSERR == force_address) &&
(session->expecting_welcome == GNUNET_NO) ) ||
- (GNUNET_NO == force_address) )
+ (GNUNET_NO == force_address) )
{
cand_session = select_better_session (cand_session,
session);
GNUNET_break (0);
break;
}
- if (session->inbound == GNUNET_YES)
+ if (session->inbound == GNUNET_YES)
continue;
- if (addrlen != session->connect_alen)
+ if ((addrlen != session->connect_alen) && (session->is_nat == GNUNET_NO))
continue;
- if (0 != memcmp (session->connect_addr,
+ if ((0 != memcmp (session->connect_addr,
addr,
- addrlen))
+ addrlen)) && (session->is_nat == GNUNET_NO))
continue;
cand_session = select_better_session (cand_session,
- session);
+ session);
}
session = cand_session;
}
(addr == NULL) )
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asked to transmit to `%4s' without address and I have no existing connection (failing).\n",
GNUNET_i2s (target));
#endif
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes discarded by TCP (no address and no connection)"),
msgbuf_size,
- GNUNET_NO);
+ GNUNET_NO);
return -1;
}
if (session == NULL)
is_natd = GNUNET_YES;
memcpy (&a6.sin6_addr,
&t6->ipv6_addr,
- sizeof (struct in6_addr));
+ sizeof (struct in6_addr));
sb = &a6;
sbs = sizeof (a6);
}
}
else
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Address of unexpected length: %u\n"),
addrlen);
GNUNET_break (0);
return -1; /* NAT client only works with IPv4 addresses */
- if ( (plugin->allow_nat == GNUNET_YES) && (is_natd == GNUNET_YES) &&
+ if ((plugin->allow_nat == GNUNET_YES) && (is_natd == GNUNET_YES) &&
(GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(plugin->nat_wait_conns, &target->hashPubKey)))
{
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- _("Found valid IPv4 NAT address!\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Found valid IPv4 NAT address (creating session)!\n"));
#endif
session = create_session (plugin,
target,
/* create new message entry */
pm = GNUNET_malloc (sizeof (struct PendingMessage) + msgbuf_size);
+ /* FIXME: the memset of this malloc can be up to 2% of our total runtime */
pm->msg = (const char*) &pm[1];
memcpy (&pm[1], msg, msgbuf_size);
+ /* FIXME: this memcpy can be up to 7% of our total run-time
+ (for transport service) */
pm->message_size = msgbuf_size;
pm->timeout = GNUNET_TIME_relative_to_absolute (timeout);
pm->transmit_cont = cont;
GNUNET_assert(GNUNET_CONTAINER_multihashmap_put(plugin->nat_wait_conns, &target->hashPubKey, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY) == GNUNET_OK);
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Created NAT WAIT connection to `%4s' at `%s'\n",
GNUNET_i2s (target),
GNUNET_a2s (sb, sbs));
#endif
- run_gnunet_nat_client(plugin, sb, sbs);
+ run_gnunet_nat_client (plugin, sb, sbs);
return 0;
}
else if ((plugin->allow_nat == GNUNET_YES) && (is_natd == GNUNET_YES) && (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains(plugin->nat_wait_conns, &target->hashPubKey)))
return -1;
}
sa = GNUNET_CONNECTION_create_from_sockaddr (plugin->env->sched,
- af, sb, sbs,
- GNUNET_SERVER_MAX_MESSAGE_SIZE);
+ af, sb, sbs);
if (sa == NULL)
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to create connection to `%4s' at `%s'\n",
GNUNET_i2s (target),
GNUNET_a2s (sb, sbs));
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes discarded by TCP (failed to connect)"),
msgbuf_size,
- GNUNET_NO);
+ GNUNET_NO);
return -1;
}
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Asked to transmit to `%4s', creating fresh session using address `%s'.\n",
GNUNET_i2s (target),
GNUNET_a2s (sb, sbs));
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes currently in TCP buffers"),
msgbuf_size,
- GNUNET_NO);
+ GNUNET_NO);
/* create new message entry */
pm = GNUNET_malloc (sizeof (struct PendingMessage) + msgbuf_size);
pm->msg = (const char*) &pm[1];
session->pending_messages_tail,
pm);
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asked to transmit %u bytes to `%s', added message to list.\n",
msgbuf_size,
GNUNET_i2s (target));
struct PendingMessage *pm;
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asked to cancel session with `%4s'\n",
GNUNET_i2s (target));
#endif
a6.sin6_port = t6->t6_port;
memcpy (&a6.sin6_addr,
&t6->ipv6_addr,
- sizeof (struct in6_addr));
+ sizeof (struct in6_addr));
port = ntohs (t6->t6_port);
sb = &a6;
sbs = sizeof (a6);
/**
* Check if the given port is plausible (must be either
* our listen port or our advertised port). If it is
- * neither, we return one of these two ports at random.
+ * neither, we return GNUNET_SYSERR.
*
* @param plugin global variables
* @param in_port port number to check
- * @return either in_port or a more plausible port
+ * @return GNUNET_OK if port is either open_port or adv_port
*/
-static uint16_t
+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->adv_port) || (in_port == plugin->open_port))
- return in_port;
- return (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
- 2) == 0)
- ? plugin->open_port : plugin->adv_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, our 'struct Plugin*'
* @param addr pointer to the address
* and transport, GNUNET_SYSERR if not
*/
static int
-tcp_plugin_check_address (void *cls, void *addr, size_t addrlen)
+tcp_plugin_check_address (void *cls,
+ const void *addr,
+ size_t addrlen)
{
struct Plugin *plugin = cls;
struct IPv4TcpAddress *v4;
if (addrlen == sizeof (struct IPv4TcpAddress))
{
v4 = (struct IPv4TcpAddress *) addr;
- v4->t_port = htons (check_port (plugin, ntohs (v4->t_port)));
+ if (GNUNET_OK !=
+ check_port (plugin, ntohs (v4->t_port)))
+ return GNUNET_SYSERR;
+ if (GNUNET_OK !=
+ check_local_addr (plugin, &v4->ipv4_addr, sizeof (uint32_t)))
+ {
+ return GNUNET_SYSERR;
+ }
}
else
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
- v6->t6_port = htons (check_port (plugin, ntohs (v6->t6_port)));
+ if (GNUNET_OK !=
+ check_port (plugin, ntohs (v6->t6_port)))
+ return GNUNET_SYSERR;
+ if (GNUNET_OK !=
+ check_local_addr (plugin, &v6->ipv6_addr, sizeof (struct in6_addr)))
+ {
+ return GNUNET_SYSERR;
+ }
}
return GNUNET_OK;
}
const struct sockaddr_in6 *s6;
#if DEBUG_TCP_NAT
- GNUNET_log_from(GNUNET_ERROR_TYPE_DEBUG, "tcp", "received tcp NAT probe\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "received tcp NAT probe\n");
#endif
/* We have received a TCP NAT probe, meaning we (hopefully) initiated
* a connection to this peer by running gnunet-nat-client. This peer
if (ntohs(message->size) != sizeof(struct TCP_NAT_ProbeMessage))
{
#if DEBUG_TCP_NAT
- GNUNET_log_from(GNUNET_ERROR_TYPE_DEBUG, "tcp", "Bad size fo tcp NAT probe, expected %d got %d.\n", sizeof(struct TCP_NAT_ProbeMessage), ntohs(message->size));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Bad size for tcp NAT probe, expected %d got %d.\n", sizeof(struct TCP_NAT_ProbeMessage), ntohs(message->size));
#endif
GNUNET_break_op(0);
return;
if (GNUNET_CONTAINER_multihashmap_contains(plugin->nat_wait_conns, &tcp_nat_probe->clientIdentity.hashPubKey) == GNUNET_YES)
{
#if DEBUG_TCP_NAT
- GNUNET_log_from(GNUNET_ERROR_TYPE_DEBUG, "tcp", "Found session for NAT probe!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found session for NAT probe!\n");
#endif
session = GNUNET_CONTAINER_multihashmap_get(plugin->nat_wait_conns, &tcp_nat_probe->clientIdentity.hashPubKey);
GNUNET_assert(session != NULL);
GNUNET_SERVER_client_keep (client);
session->client = client;
session->last_activity = GNUNET_TIME_absolute_get ();
+ session->inbound = GNUNET_NO;
if (GNUNET_OK ==
GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
{
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Found address `%s' for incoming connection %p\n",
GNUNET_a2s (vaddr, alen),
client);
#endif
- if (alen == sizeof (struct sockaddr_in))
+ if (((const struct sockaddr *)vaddr)->sa_family == AF_INET)
{
s4 = vaddr;
t4 = GNUNET_malloc (sizeof (struct IPv4TcpAddress));
session->connect_addr = t4;
session->connect_alen = sizeof (struct IPv4TcpAddress);
}
- else if (alen == sizeof (struct sockaddr_in6))
+ else if (((const struct sockaddr *)vaddr)->sa_family == AF_INET6)
{
s6 = vaddr;
t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress));
session->connect_addr = t6;
session->connect_alen = sizeof (struct IPv6TcpAddress);
}
-
- session->connect_addr = GNUNET_malloc (alen);
- memcpy (session->connect_addr,
- vaddr,
- alen);
- session->connect_alen = alen;
+ else
+ {
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Bad address for incoming connection!\n");
+#endif
+ }
GNUNET_free (vaddr);
}
else
{
#if DEBUG_TCP_NAT
- GNUNET_log_from(GNUNET_ERROR_TYPE_DEBUG, "tcp", "Did NOT find session for NAT probe!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Did NOT find session for NAT probe!\n");
#endif
}
+
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
/**
const struct sockaddr_in *s4;
const struct sockaddr_in6 *s6;
-
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
- "Received %s message from a `%4s/%p'.\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received %s message from a `%4s/%p'.\n",
"WELCOME",
GNUNET_i2s (&wm->clientIdentity), client);
#endif
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# TCP WELCOME messages received"),
1,
- GNUNET_NO);
+ GNUNET_NO);
session = find_session_by_client (plugin, client);
if (session == NULL)
{
GNUNET_SERVER_client_keep (client);
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Received %s message from a `%4s/%p', creating session\n",
+ "WELCOME",
+ GNUNET_i2s (&wm->clientIdentity), client);
+#endif
session = create_session (plugin,
&wm->clientIdentity, client, GNUNET_NO);
session->inbound = GNUNET_YES;
GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Found address `%s' for incoming connection %p\n",
GNUNET_a2s (vaddr, alen),
client);
else
{
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Did not obtain TCP socket address for incoming connection\n");
#endif
}
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Creating new session %p for connection %p\n",
session, client);
#endif
session->receive_delay_task = GNUNET_SCHEDULER_NO_TASK;
delay = session->plugin->env->receive (session->plugin->env->cls,
&session->target,
- NULL, 0,
+ NULL, 0,
session,
NULL, 0);
if (delay.value == 0)
GNUNET_SERVER_receive_done (session->client, GNUNET_OK);
else
- session->receive_delay_task =
+ session->receive_delay_task =
GNUNET_SCHEDULER_add_delayed (session->plugin->env->sched,
delay, &delayed_done, session);
}
{
/* We don't want to propagate WELCOME and NAT Probe messages up! */
GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
+ return;
+ }
session = find_session_by_client (plugin, client);
if ( (NULL == session) || (GNUNET_YES == session->expecting_welcome))
{
}
session->last_activity = GNUNET_TIME_absolute_get ();
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Passing %u bytes of type %u from `%4s' to transport service.\n",
- (unsigned int) ntohs (message->size),
+ (unsigned int) ntohs (message->size),
(unsigned int) ntohs (message->type),
GNUNET_i2s (&session->target));
#endif
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes received via TCP"),
ntohs (message->size),
- GNUNET_NO);
+ GNUNET_NO);
delay = plugin->env->receive (plugin->env->cls, &session->target, message, 1,
- session,
+ session,
(GNUNET_YES == session->inbound) ? NULL : session->connect_addr,
(GNUNET_YES == session->inbound) ? 0 : session->connect_alen);
if (delay.value == 0)
GNUNET_SERVER_receive_done (client, GNUNET_OK);
else
- session->receive_delay_task =
+ session->receive_delay_task =
GNUNET_SCHEDULER_add_delayed (session->plugin->env->sched,
delay, &delayed_done, session);
}
-/**
- * Handlers for the various TCP messages.
- */
-static struct GNUNET_SERVER_MessageHandler my_handlers[] = {
- {&handle_tcp_welcome, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME,
- sizeof (struct WelcomeMessage)},
- {&handle_tcp_nat_probe, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE, sizeof (struct TCP_NAT_ProbeMessage)},
- {&handle_tcp_data, NULL, GNUNET_MESSAGE_TYPE_ALL, 0},
- {NULL, NULL, 0, 0}
-};
-
-
/**
* Functions with this signature are called whenever a peer
* is disconnected on the network level.
* @param client identification of the client
*/
static void
-disconnect_notify (void *cls,
+disconnect_notify (void *cls,
struct GNUNET_SERVER_Client *client)
{
struct Plugin *plugin = cls;
if (session == NULL)
return; /* unknown, nothing to do */
#if DEBUG_TCP
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Destroying session of `%4s' with %s (%p) due to network-level disconnect.\n",
GNUNET_i2s (&session->target),
(session->connect_addr != NULL) ?
void *arg;
uint16_t args;
void *arg_nat;
+ char buf[INET_ADDRSTRLEN];
af = addr->sa_family;
arg_nat = NULL;
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->bind_address != NULL) && (0 != strcmp(buf, plugin->bind_address)))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s: Not notifying transport of address %s\n", "TCP", 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.t_port = htons(0);
else if (plugin->behind_nat == GNUNET_YES) /* We are behind NAT, but will advertise NAT and normal addresses */
}
else if (af == AF_INET6)
{
- if (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr))
+ if ((IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr)) || (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno(plugin->env->cfg, "transport-tcp", "disablev6")))
{
/* skip link local addresses */
return GNUNET_OK;
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.t6_port = htons(0);
else if (plugin->behind_nat == GNUNET_YES) /* We are behind NAT, but will advertise NAT and normal addresses */
GNUNET_break (0);
return GNUNET_OK;
}
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO |
- GNUNET_ERROR_TYPE_BULK,
- "tcp",
- _("Found address `%s' (%s)\n"),
- GNUNET_a2s (addr, addrlen), name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Found address `%s' (%s) len %d\n"),
+ GNUNET_a2s (addr, addrlen), name, args);
plugin->env->notify_address (plugin->env->cls,
"tcp",
if (arg_nat != NULL)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO |
- GNUNET_ERROR_TYPE_BULK,
- "tcp",
- _("Found address `%s' (%s)\n"),
- GNUNET_a2s (addr, addrlen), name);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Found address `%s' (%s) len %d\n"),
+ GNUNET_a2s (addr, addrlen), name, args);
plugin->env->notify_address (plugin->env->cls,
"tcp",
arg_nat, args, GNUNET_TIME_UNIT_FOREVER_REL);
if (bytes < 1)
{
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
+ 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++)
{
return;
}
-#if DEBUG_UDP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
+#if DEBUG_TCP_NAT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("nat-server-read read: %s port %d\n"), &mybuf, port);
#endif
if (inet_pton(AF_INET, &mybuf[0], &in_addr.sin_addr) != 1)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("nat-server-read malformed address\n"), &mybuf, port);
plugin->server_read_task =
* that wants to connect to us! Send a message to establish a connection.
*/
sock = GNUNET_CONNECTION_create_from_sockaddr (plugin->env->sched, AF_INET, (struct sockaddr *)&in_addr,
- sizeof(in_addr), GNUNET_SERVER_MAX_MESSAGE_SIZE);
+ sizeof(in_addr));
+
+
if (sock == NULL)
{
plugin->server_read_task =
}
else
{
- tcp_probe_ctx = GNUNET_malloc(sizeof(struct TCPProbeContext));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Sending TCP probe message!\n"), &mybuf, port);
+ tcp_probe_ctx = GNUNET_malloc(sizeof(struct TCPProbeContext));
tcp_probe_ctx->message.header.size = htons(sizeof(struct TCP_NAT_ProbeMessage));
tcp_probe_ctx->message.header.type = htons(GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE);
memcpy(&tcp_probe_ctx->message.clientIdentity, plugin->env->my_identity, sizeof(struct GNUNET_PeerIdentity));
}
+ /*GNUNET_SERVER_connect_socket(plugin->server, sock);*/
plugin->server_read_task =
GNUNET_SCHEDULER_add_read_file (plugin->env->sched,
GNUNET_TIME_UNIT_FOREVER_REL,
return GNUNET_SYSERR;
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ 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 */
if (plugin->server_pid == GNUNET_SYSERR)
{
#if DEBUG_TCP_NAT
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to start gnunet-nat-server process\n");
#endif
return GNUNET_SYSERR;
void *
libgnunet_plugin_transport_tcp_init (void *cls)
{
+ static const struct GNUNET_SERVER_MessageHandler my_handlers[] = {
+ {&handle_tcp_welcome, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME,
+ sizeof (struct WelcomeMessage)},
+ {&handle_tcp_nat_probe, NULL, GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE, sizeof (struct TCP_NAT_ProbeMessage)},
+ {&handle_tcp_data, NULL, GNUNET_MESSAGE_TYPE_ALL, 0},
+ {NULL, NULL, 0, 0}
+ };
struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
struct GNUNET_TRANSPORT_PluginFunctions *api;
struct Plugin *plugin;
service = GNUNET_SERVICE_start ("transport-tcp", env->sched, env->cfg);
if (service == NULL)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
- "tcp",
- _
- ("Failed to start service for `%s' transport plugin.\n"),
- "tcp");
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to start service for `%s' transport plugin.\n"),
+ "tcp");
return NULL;
}
else
{
behind_nat = GNUNET_NO;
- GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, "tcp", "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, "tcp", "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");
}
}
else
"EXTERNAL_ADDRESS",
&external_address)))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
+ 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-tcp");
if ((external_address != NULL) && (inet_pton(AF_INET, external_address, &in_addr.sin_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,
- "tcp",
- _
- ("Require INTERNAL_ADDRESS for service `%s' in configuration!\n"),
- "transport-tcp");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Require INTERNAL_ADDRESS for service `%s' in configuration!\n"),
+ "transport-tcp");
GNUNET_SERVICE_stop (service);
GNUNET_free_non_null(external_address);
return NULL;
if ((internal_address != NULL) && (inet_pton(AF_INET, internal_address, &in_addr.sin_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);
}
aport = 0;
"ADVERTISED-PORT",
&aport)) && (aport > 65535)))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("Require valid port number for service `%s' in configuration!\n"),
"transport-tcp");
plugin->handlers[i].callback_cls = plugin;
GNUNET_SERVER_add_handlers (plugin->server, plugin->handlers);
- if (behind_nat == GNUNET_YES)
+ if (plugin->behind_nat == GNUNET_YES)
{
if (GNUNET_YES != tcp_transport_start_nat_server(plugin))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+
_
("Failed to start %s required for NAT in %s!\n"),
"gnunet-nat-server"
GNUNET_free_non_null(external_address);
GNUNET_free_non_null(internal_address);
GNUNET_SERVICE_stop (service);
+ GNUNET_free (api);
return NULL;
}
}
GNUNET_assert(plugin->nat_wait_conns != NULL);
}
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
- "tcp", _("TCP transport listening on port %llu\n"), bport);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("TCP transport listening on port %llu\n"), bport);
if (aport != bport)
- GNUNET_log_from (GNUNET_ERROR_TYPE_INFO,
- "tcp",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("TCP transport advertises itself as being on port %llu\n"),
aport);
- GNUNET_SERVER_disconnect_notify (plugin->server,
+ GNUNET_SERVER_disconnect_notify (plugin->server,
&disconnect_notify,
plugin);
+ GNUNET_CONFIGURATION_get_value_string(env->cfg, "transport-tcp", "BINDTO", &plugin->bind_address);
+
if (plugin->behind_nat == GNUNET_NO)
{
GNUNET_OS_network_interfaces_list (&process_interfaces, plugin);
if ((plugin->behind_nat == GNUNET_YES) && (inet_pton(AF_INET, plugin->external_address, &t4.ipv4_addr) == 1))
{
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Notifying transport of address %s:0\n", plugin->external_address);
t4.t_port = htons(0);
+ add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t));
plugin->env->notify_address (plugin->env->cls,
"tcp",
- &t4, sizeof(t4), GNUNET_TIME_UNIT_FOREVER_REL);
+ &t4, sizeof(t4), GNUNET_TIME_UNIT_FOREVER_REL);
}
else if ((plugin->external_address != NULL) && (inet_pton(AF_INET, plugin->external_address, &t4.ipv4_addr) == 1))
{
t4.t_port = htons(plugin->adv_port);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Notifying transport of address %s:%d\n", plugin->external_address, plugin->adv_port);
+ add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t));
plugin->env->notify_address (plugin->env->cls,
"tcp",
&t4, sizeof(t4), GNUNET_TIME_UNIT_FOREVER_REL);
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
struct Session *session;
+ struct LocalAddrList *lal;
while (NULL != (session = plugin->sessions))
disconnect_session (session);
}
GNUNET_SERVICE_stop (plugin->service);
GNUNET_free (plugin->handlers);
+ while (NULL != (lal = plugin->lal_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (plugin->lal_head,
+ plugin->lal_tail,
+ lal);
+ GNUNET_free (lal);
+ }
+
+ 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);
+ }
+ GNUNET_free_non_null(plugin->bind_address);
GNUNET_free (plugin);
GNUNET_free (api);
return NULL;
projects / oweals / gnunet.git / blobdiff