/*
This file is part of GNUnet
- (C) 2002--2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2002--2015 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file transport/plugin_transport_tcp.c
#define PLUGIN_NAME "tcp"
-#define EXTRA_CHECKS ALLOW_EXTRA_CHECKS
-
/**
* How long until we give up on establishing an NAT connection?
* Must be > 4 RTT
struct Plugin *plugin;
};
+/**
+ * Bits in the `options` field of TCP addresses.
+ */
+enum TcpAddressOptions
+{
+
+ /**
+ * No bits set.
+ */
+ TCP_OPTIONS_NONE = 0,
+
+ /**
+ * See #HTTP_OPTIONS_VERIFY_CERTIFICATE.
+ */
+ TCP_OPTIONS_RESERVED = 1,
+
+ /**
+ * Enable TCP Stealth-style port knocking.
+ */
+ TCP_OPTIONS_TCP_STEALTH = 2
+};
+
GNUNET_NETWORK_STRUCT_BEGIN
/**
struct IPv4TcpAddress
{
/**
- * Optional options and flags for this address
+ * Optional options and flags for this address,
+ * see `enum TcpAddressOptions`
*/
- uint32_t options;
+ uint32_t options GNUNET_PACKED;
/**
* IPv4 address, in network byte order.
{
/**
* Optional flags for this address
+ * see `enum TcpAddressOptions`
*/
- uint32_t options;
+ uint32_t options GNUNET_PACKED;
/**
* IPv6 address.
GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
/**
- * Closure for transmit_cont.
+ * Closure for @e transmit_cont.
*/
void *transmit_cont_cls;
/**
* So that the gnunet-service-transport can group messages together,
* these pending messages need to accept a message buffer and size
- * instead of just a GNUNET_MessageHeader.
+ * instead of just a `struct GNUNET_MessageHeader`.
*/
size_t message_size;
/**
* Task cleaning up a NAT client connection establishment attempt;
*/
- GNUNET_SCHEDULER_TaskIdentifier nat_connection_timeout;
+ struct GNUNET_SCHEDULER_Task *nat_connection_timeout;
/**
* Messages currently pending for transmission
/**
* ID of task used to delay receiving more to throttle sender.
*/
- GNUNET_SCHEDULER_TaskIdentifier receive_delay_task;
+ struct GNUNET_SCHEDULER_Task *receive_delay_task;
/**
* Session timeout task
*/
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+ struct GNUNET_SCHEDULER_Task *timeout_task;
/**
* When will this session time out?
*/
struct GNUNET_TIME_Absolute timeout;
+ /**
+ * When will we continue to read from the socket?
+ * (used to enforce inbound quota).
+ */
+ struct GNUNET_TIME_Absolute receive_delay;
+
/**
* Last activity on this connection. Used to select preferred
* connection.
*/
unsigned int msgs_in_queue;
+ /**
+ * Network type of the address.
+ */
+ enum GNUNET_ATS_Network_Type scope;
+
/**
* Are we still expecting the welcome message? (#GNUNET_YES/#GNUNET_NO)
*/
*/
int is_nat;
+};
+
+
+/**
+ * Context for address to string conversion, closure
+ * for #append_port().
+ */
+struct PrettyPrinterContext
+{
+ /**
+ * DLL
+ */
+ struct PrettyPrinterContext *next;
+
+ /**
+ * DLL
+ */
+ struct PrettyPrinterContext *prev;
+
+ /**
+ * Our plugin.
+ */
+ struct Plugin *plugin;
+
+ /**
+ * Timeout task
+ */
+ struct GNUNET_SCHEDULER_Task *timeout_task;
+
+ /**
+ * Resolver handle
+ */
+ struct GNUNET_RESOLVER_RequestHandle *resolver_handle;
+
/**
- * ATS network type in NBO
+ * Function to call with the result.
+ */
+ GNUNET_TRANSPORT_AddressStringCallback asc;
+
+ /**
+ * Clsoure for @e asc.
+ */
+ void *asc_cls;
+
+ /**
+ * IPv6 address
+ */
+ int ipv6;
+
+ /**
+ * Options
+ */
+ uint32_t options;
+
+ /**
+ * Port to add after the IP address.
*/
- enum GNUNET_ATS_Network_Type ats_address_network_type;
+ uint16_t port;
};
+
/**
* Encapsulation of all of the state of the plugin.
*/
*/
void *sic_cls;
+ /**
+ * ID of task used to update our addresses when one expires.
+ */
+ struct GNUNET_SCHEDULER_Task *address_update_task;
+
+ /**
+ * Running pretty printers: head
+ */
+ struct PrettyPrinterContext *ppc_dll_head;
+
+ /**
+ * Running pretty printers: tail
+ */
+ struct PrettyPrinterContext *ppc_dll_tail;
+
+ /**
+ * Welcome message used by this peer.
+ */
+ struct WelcomeMessage my_welcome;
+
/**
* How many more TCP sessions are we allowed to open right now?
*/
*/
unsigned long long cur_connections;
- /**
- * ID of task used to update our addresses when one expires.
- */
- GNUNET_SCHEDULER_TaskIdentifier address_update_task;
-
/**
* Address options
*/
return;
memset (&info, 0, sizeof (info));
info.state = state;
- info.is_inbound = GNUNET_SYSERR; /* hard to say */
+ info.is_inbound = (0 != (GNUNET_HELLO_ADDRESS_INFO_INBOUND & session->address->local_info))
+ ? GNUNET_YES
+ : GNUNET_NO;
info.num_msg_pending = session->msgs_in_queue;
info.num_bytes_pending = session->bytes_in_queue;
- /* info.receive_delay remains zero as this is not supported by UDP
- (cannot selectively not receive from 'some' peer while continuing
- to receive from others) */
+ if (NULL != session->receive_delay_task)
+ info.receive_delay = session->receive_delay;
info.session_timeout = session->timeout;
info.address = session->address;
plugin->sic (plugin->sic_cls,
}
-/**
- * Function called for a quick conversion of the binary address to
- * 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
- */
-static const char *
-tcp_address_to_string (void *cls,
- const void *addr,
- size_t addrlen);
-
-
-/**
- * Function to check if an inbound connection is acceptable.
- * Mostly used to limit the total number of open connections
- * we can have.
- *
- * @param cls the `struct Plugin`
- * @param ucred credentials, if available, otherwise NULL
- * @param addr address
- * @param addrlen length of address
- * @return #GNUNET_YES to allow, #GNUNET_NO to deny, #GNUNET_SYSERR
- * for unknown address family (will be denied).
- */
-static int
-plugin_tcp_access_check (void *cls,
- const struct GNUNET_CONNECTION_Credentials *ucred,
- const struct sockaddr *addr,
- socklen_t addrlen)
-{
- struct Plugin *plugin = cls;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Accepting new incoming TCP connection from `%s'\n",
- GNUNET_a2s (addr, addrlen));
- if (plugin->cur_connections >= plugin->max_connections)
- return GNUNET_NO;
- plugin->cur_connections++;
- return GNUNET_YES;
-}
-
-
/**
* Our external IP address/port mapping has changed.
*
void *arg;
size_t args;
- LOG(GNUNET_ERROR_TYPE_INFO, "NAT notification to %s address `%s'\n",
+ LOG(GNUNET_ERROR_TYPE_INFO,
+ "NAT notification to %s address `%s'\n",
(GNUNET_YES == add_remove) ? "add" : "remove",
GNUNET_a2s (addr, addrlen));
/* convert 'addr' to our internal format */
* @return string representing the same address
*/
static const char *
-tcp_address_to_string (void *cls,
- const void *addr,
- size_t addrlen)
+tcp_plugin_address_to_string (void *cls,
+ const void *addr,
+ size_t addrlen)
{
static char rbuf[INET6_ADDRSTRLEN + 12];
char buf[INET6_ADDRSTRLEN];
default:
LOG (GNUNET_ERROR_TYPE_WARNING,
_("Unexpected address length: %u bytes\n"),
- (unsigned int ) addrlen);
+ (unsigned int) addrlen);
return NULL ;
}
if (NULL == inet_ntop (af, sb, buf, INET6_ADDRSTRLEN))
* @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
*/
static int
-tcp_string_to_address (void *cls,
- const char *addr,
- uint16_t addrlen,
- void **buf,
- size_t *added)
+tcp_plugin_string_to_address (void *cls,
+ const char *addr,
+ uint16_t addrlen,
+ void **buf,
+ size_t *added)
{
struct sockaddr_storage socket_address;
char *address;
address = NULL;
plugin = NULL;
optionstr = NULL;
- if ((NULL == addr) || (addrlen == 0))
+ if ((NULL == addr) || (0 == addrlen))
{
GNUNET_break(0);
return GNUNET_SYSERR;
address[0] = '\0';
address++;
- if (GNUNET_OK
- != GNUNET_STRINGS_to_address_ip (address, strlen (address),
- &socket_address))
+ if (GNUNET_OK !=
+ GNUNET_STRINGS_to_address_ip (address,
+ strlen (address),
+ &socket_address))
{
GNUNET_break(0);
GNUNET_free(plugin);
lookup_session_by_client (struct Plugin *plugin,
struct GNUNET_SERVER_Client *client)
{
- return GNUNET_SERVER_client_get_user_context (client, struct Session);
+ return GNUNET_SERVER_client_get_user_context (client,
+ struct Session);
}
* @return #GNUNET_OK on success
*/
static int
-tcp_disconnect_session (void *cls,
- struct Session *session)
+tcp_plugin_disconnect_session (void *cls,
+ struct Session *session)
{
struct Plugin *plugin = cls;
struct PendingMessage *pm;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Disconnecting session of peer `%s' address `%s'\n",
GNUNET_i2s (&session->target),
- tcp_address_to_string (NULL,
- session->address->address,
- session->address->address_length));
+ tcp_plugin_address_to_string (session->plugin,
+ session->address->address,
+ session->address->address_length));
- if (GNUNET_SCHEDULER_NO_TASK != session->timeout_task)
+ if (NULL != session->timeout_task)
{
GNUNET_SCHEDULER_cancel (session->timeout_task);
- session->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ session->timeout_task = NULL;
session->timeout = GNUNET_TIME_UNIT_ZERO_ABS;
}
session))
{
GNUNET_STATISTICS_update (session->plugin->env->stats,
- gettext_noop ("# TCP sessions active"), -1, GNUNET_NO);
+ gettext_noop ("# TCP sessions active"),
+ -1,
+ GNUNET_NO);
}
else
{
- GNUNET_assert(GNUNET_YES ==
- GNUNET_CONTAINER_multipeermap_remove (plugin->nat_wait_conns,
- &session->target,
- session));
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_remove (plugin->nat_wait_conns,
+ &session->target,
+ session));
}
if (NULL != session->client)
GNUNET_SERVER_client_set_user_context (session->client,
- (void *) NULL);
+ NULL);
/* clean up state */
if (NULL != session->transmit_handle)
GNUNET_SERVER_notify_transmit_ready_cancel (session->transmit_handle);
session->transmit_handle = NULL;
}
- plugin->env->unregister_quota_notification (plugin->env->cls,
- &session->target,
- PLUGIN_NAME,
- session);
session->plugin->env->session_end (session->plugin->env->cls,
session->address,
session);
- if (GNUNET_SCHEDULER_NO_TASK != session->nat_connection_timeout)
+ if (NULL != session->nat_connection_timeout)
{
GNUNET_SCHEDULER_cancel (session->nat_connection_timeout);
- session->nat_connection_timeout = GNUNET_SCHEDULER_NO_TASK;
+ session->nat_connection_timeout = NULL;
}
while (NULL != (pm = session->pending_messages_head))
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
(NULL != pm->transmit_cont)
- ? "Could not deliver message to `%4s'.\n"
- : "Could not deliver message to `%4s', notifying.\n",
- GNUNET_i2s (&session->target));
+ ? "Could not deliver message to `%s' at %s.\n"
+ : "Could not deliver message to `%s' at %s, notifying.\n",
+ GNUNET_i2s (&session->target),
+ tcp_plugin_address_to_string (session->plugin,
+ session->address->address,
+ session->address->address_length));
GNUNET_STATISTICS_update (session->plugin->env->stats,
gettext_noop ("# bytes currently in TCP buffers"),
-(int64_t) pm->message_size, GNUNET_NO);
GNUNET_assert (0 == session->bytes_in_queue);
notify_session_monitor (session->plugin,
session,
- GNUNET_TRANSPORT_SS_UP);
+ GNUNET_TRANSPORT_SS_DONE);
- if (session->receive_delay_task != GNUNET_SCHEDULER_NO_TASK )
+ if (NULL != session->receive_delay_task)
{
GNUNET_SCHEDULER_cancel (session->receive_delay_task);
- if (NULL != session->client)
- GNUNET_SERVER_receive_done (session->client, GNUNET_SYSERR);
+ session->receive_delay_task = NULL;
}
if (NULL != session->client)
{
GNUNET_SERVER_client_disconnect (session->client);
- GNUNET_SERVER_client_drop (session->client);
session->client = NULL;
}
GNUNET_HELLO_address_free (session->address);
- GNUNET_assert(NULL == session->transmit_handle);
- GNUNET_free(session);
+ GNUNET_assert (NULL == session->transmit_handle);
+ GNUNET_free (session);
return GNUNET_OK;
}
* @return keepalive factor
*/
static unsigned int
-tcp_query_keepalive_factor (void *cls)
+tcp_plugin_query_keepalive_factor (void *cls)
{
return 3;
}
/**
- * Session was idle, so disconnect it
+ * Session was idle for too long, so disconnect it
*
* @param cls the `struct Session` of the idle session
* @param tc scheduler context
struct Session *s = cls;
struct GNUNET_TIME_Relative left;
- s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ s->timeout_task = NULL;
left = GNUNET_TIME_absolute_get_remaining (s->timeout);
if (0 != left.rel_value_us)
{
the monitor, it may think we're about to die ... */
notify_session_monitor (s->plugin,
s,
- GNUNET_TRANSPORT_SS_UP);
+ GNUNET_TRANSPORT_SS_UPDATE);
s->timeout_task = GNUNET_SCHEDULER_add_delayed (left,
&session_timeout,
s);
return;
}
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Session %p was idle for %s, disconnecting\n",
- s,
- GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
- GNUNET_YES));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Session %p was idle for %s, disconnecting\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ GNUNET_YES));
/* call session destroy function */
- tcp_disconnect_session (s->plugin, s);
+ tcp_plugin_disconnect_session (s->plugin,
+ s);
}
/**
- * Increment session timeout due to activity
+ * Increment session timeout due to activity.
*
* @param s session to increment timeout for
*/
static void
reschedule_session_timeout (struct Session *s)
{
- GNUNET_assert(GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
+ GNUNET_assert (NULL != s->timeout_task);
s->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
}
*
* @param plugin the plugin
* @param address the address to create the session for
+ * @param scope network scope the address is from
* @param client client to use, reference counter must have already been increased
* @param is_nat this a NAT session, we should wait for a client to
* connect to us from an address, then assign that to
static struct Session *
create_session (struct Plugin *plugin,
const struct GNUNET_HELLO_Address *address,
+ enum GNUNET_ATS_Network_Type scope,
struct GNUNET_SERVER_Client *client,
int is_nat)
{
struct Session *session;
struct PendingMessage *pm;
- struct WelcomeMessage welcome;
if (GNUNET_YES != is_nat)
- GNUNET_assert(NULL != client);
+ GNUNET_assert (NULL != client);
else
- GNUNET_assert(NULL == client);
+ GNUNET_assert (NULL == client);
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Creating new session for peer `%4s'\n",
- GNUNET_i2s (&address->peer));
+ "Creating new session for peer `%4s' at address %s\n",
+ GNUNET_i2s (&address->peer),
+ tcp_plugin_address_to_string (plugin,
+ address->address,
+ address->address_length));
session = GNUNET_new (struct Session);
session->last_activity = GNUNET_TIME_absolute_get ();
session->plugin = plugin;
session->is_nat = is_nat;
- session->client = client;
+ if (NULL != client)
+ {
+ session->client = client;
+ GNUNET_SERVER_client_set_user_context (client,
+ session);
+ }
session->address = GNUNET_HELLO_address_copy (address);
session->target = address->peer;
session->expecting_welcome = GNUNET_YES;
- session->ats_address_network_type = GNUNET_ATS_NET_UNSPECIFIED;
+ session->scope = scope;
pm = GNUNET_malloc (sizeof (struct PendingMessage) +
- sizeof (struct WelcomeMessage));
+ sizeof (struct WelcomeMessage));
pm->msg = (const char *) &pm[1];
pm->message_size = sizeof(struct WelcomeMessage);
- welcome.header.size = htons (sizeof(struct WelcomeMessage));
- welcome.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME);
- welcome.clientIdentity = *plugin->env->my_identity;
- memcpy (&pm[1], &welcome, sizeof(welcome));
+ memcpy (&pm[1],
+ &plugin->my_welcome,
+ sizeof(struct WelcomeMessage));
pm->timeout = GNUNET_TIME_UNIT_FOREVER_ABS;
GNUNET_STATISTICS_update (plugin->env->stats,
- gettext_noop ("# bytes currently in TCP buffers"), pm->message_size,
- GNUNET_NO);
+ gettext_noop ("# bytes currently in TCP buffers"),
+ pm->message_size,
+ GNUNET_NO);
GNUNET_CONTAINER_DLL_insert (session->pending_messages_head,
session->pending_messages_tail,
pm);
session->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
&session_timeout,
session);
+ notify_session_monitor (session->plugin,
+ session,
+ GNUNET_TRANSPORT_SS_INIT);
if (GNUNET_YES != is_nat)
{
GNUNET_STATISTICS_update (plugin->env->stats,
session,
GNUNET_TRANSPORT_SS_HANDSHAKE);
}
- plugin->env->register_quota_notification (plugin->env->cls,
- &address->peer,
- PLUGIN_NAME,
- session);
return session;
}
* @return number of bytes written to @a buf
*/
static size_t
-do_transmit (void *cls, size_t size, void *buf)
+do_transmit (void *cls,
+ size_t size,
+ void *buf)
{
struct Session *session = cls;
struct GNUNET_PeerIdentity pid;
tl = NULL;
ret = 0;
now = GNUNET_TIME_absolute_get ();
- while ((NULL != (pos = session->pending_messages_head))
- && (pos->timeout.abs_value_us <= now.abs_value_us))
+ while ( (NULL != (pos = session->pending_messages_head)) &&
+ (pos->timeout.abs_value_us <= now.abs_value_us) )
{
GNUNET_CONTAINER_DLL_remove (session->pending_messages_head,
session->pending_messages_tail,
pos->message_size,
GNUNET_i2s (&session->target));
ret += pos->message_size;
- GNUNET_CONTAINER_DLL_insert_after (hd, tl, tl, pos);
+ GNUNET_CONTAINER_DLL_insert_after (hd,
+ tl,
+ tl,
+ pos);
}
/* do this call before callbacks (so that if callbacks destroy
* session, they have a chance to cancel actions done by this
* the callbacks may abort the session */
while (NULL != (pos = hd))
{
- GNUNET_CONTAINER_DLL_remove (hd, tl, pos);
- if (pos->transmit_cont != NULL)
+ GNUNET_CONTAINER_DLL_remove (hd,
+ tl,
+ pos);
+ if (NULL != pos->transmit_cont)
pos->transmit_cont (pos->transmit_cont_cls,
&pid,
GNUNET_SYSERR,
- pos->message_size, 0);
+ pos->message_size,
+ 0);
GNUNET_free (pos);
}
GNUNET_STATISTICS_update (plugin->env->stats,
if (0 < ret)
notify_session_monitor (session->plugin,
session,
- GNUNET_TRANSPORT_SS_UP);
+ GNUNET_TRANSPORT_SS_UPDATE);
return 0;
}
/* copy all pending messages that would fit */
GNUNET_assert (pos->message_size <= session->bytes_in_queue);
session->bytes_in_queue -= pos->message_size;
GNUNET_assert(size >= pos->message_size);
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting message of type %u size %u\n",
- ntohs (((struct GNUNET_MessageHeader * ) pos->msg)->type),
- pos->message_size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Transmitting message of type %u size %u to peer %s at %s\n",
+ ntohs (((struct GNUNET_MessageHeader *) pos->msg)->type),
+ pos->message_size,
+ GNUNET_i2s (&session->target),
+ tcp_plugin_address_to_string (session->plugin,
+ session->address->address,
+ session->address->address_length));
/* FIXME: this memcpy can be up to 7% of our total runtime */
- memcpy (cbuf, pos->msg, pos->message_size);
+ memcpy (cbuf,
+ pos->msg,
+ pos->message_size);
cbuf += pos->message_size;
ret += pos->message_size;
size -= pos->message_size;
- GNUNET_CONTAINER_DLL_insert_tail (hd, tl, pos);
+ GNUNET_CONTAINER_DLL_insert_tail (hd,
+ tl,
+ pos);
}
notify_session_monitor (session->plugin,
session,
- GNUNET_TRANSPORT_SS_UP);
+ GNUNET_TRANSPORT_SS_UPDATE);
/* schedule 'continuation' before callbacks so that callbacks that
* cancel everything don't cause us to use a session that no longer
* exists... */
while (NULL != (pos = hd))
{
GNUNET_CONTAINER_DLL_remove (hd, tl, pos);
- if (pos->transmit_cont != NULL)
+ if (NULL != pos->transmit_cont)
pos->transmit_cont (pos->transmit_cont_cls,
&pid,
GNUNET_OK,
pos->message_size,
pos->message_size); /* FIXME: include TCP overhead */
- GNUNET_free(pos);
+ GNUNET_free (pos);
}
- GNUNET_assert(hd == NULL);
- GNUNET_assert(tl == NULL);
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Transmitting %u bytes\n", ret);
+ GNUNET_assert (NULL == hd);
+ GNUNET_assert (NULL == tl);
GNUNET_STATISTICS_update (plugin->env->stats,
- gettext_noop ("# bytes currently in TCP buffers"), -(int64_t) ret,
- GNUNET_NO);
+ gettext_noop ("# bytes currently in TCP buffers"),
+ - (int64_t) ret,
+ GNUNET_NO);
GNUNET_STATISTICS_update (plugin->env->stats,
- gettext_noop ("# bytes transmitted via TCP"), ret, GNUNET_NO);
+ gettext_noop ("# bytes transmitted via TCP"),
+ ret,
+ GNUNET_NO);
return ret;
}
{
struct PendingMessage *pm;
- GNUNET_assert(NULL != session->client);
+ GNUNET_assert (NULL != session->client);
if (NULL != session->transmit_handle)
return;
if (NULL == (pm = session->pending_messages_head))
return;
- session->transmit_handle = GNUNET_SERVER_notify_transmit_ready (
- session->client, pm->message_size,
- GNUNET_TIME_absolute_get_remaining (pm->timeout), &do_transmit, session);
-}
-
-#if EXTRA_CHECKS
-/**
- * Closure for #session_it().
- */
-struct FindSessionContext
-{
- /**
- * Session we are looking for.
- */
- struct Session *s;
-
- /**
- * Set to #GNUNET_OK if we found the session.
- */
- int res;
-};
-
-
-/**
- * Function called to check if a session is in our maps.
- *
- * @param cls the `struct FindSessionContext`
- * @param key peer identity
- * @param value session in the map
- * @return #GNUNET_YES to continue looking, #GNUNET_NO if we found the session
- */
-static int
-session_it (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
-{
- struct FindSessionContext *res = cls;
- struct Session *session = value;
-
- if (res->s == session)
- {
- res->res = GNUNET_OK;
- return GNUNET_NO;
- }
- return GNUNET_YES;
-}
-
-
-/**
- * Check that the given session is known to the plugin and
- * is in one of our maps.
- *
- * @param plugin the plugin to check against
- * @param session the session to check
- * @return #GNUNET_OK if all is well, #GNUNET_SYSERR if the session is invalid
- */
-static int
-find_session (struct Plugin *plugin, struct Session *session)
-{
- struct FindSessionContext session_map_res;
- struct FindSessionContext nat_map_res;
-
- session_map_res.s = session;
- session_map_res.res = GNUNET_SYSERR;
- GNUNET_CONTAINER_multipeermap_iterate (plugin->sessionmap, &session_it,
- &session_map_res);
- if (GNUNET_SYSERR != session_map_res.res)
- return GNUNET_OK;
- nat_map_res.s = session;
- nat_map_res.res = GNUNET_SYSERR;
- GNUNET_CONTAINER_multipeermap_iterate (plugin->nat_wait_conns, &session_it,
- &nat_map_res);
- if (GNUNET_SYSERR != nat_map_res.res)
- return GNUNET_OK;
- GNUNET_break(0);
- return GNUNET_SYSERR;
+ session->transmit_handle
+ = GNUNET_SERVER_notify_transmit_ready (session->client,
+ pm->message_size,
+ GNUNET_TIME_absolute_get_remaining (pm->timeout),
+ &do_transmit,
+ session);
}
-#endif
/**
* @param cls closure
* @param session which session must be used
* @param msgbuf the message to transmit
- * @param msgbuf_size number of bytes in 'msgbuf'
+ * @param msgbuf_size number of bytes in @a msgbuf
* @param priority how important is the message (most plugins will
* ignore message priority and just FIFO)
* @param to how long to wait at most for the transmission (does not
struct Plugin * plugin = cls;
struct PendingMessage *pm;
-#if EXTRA_CHECKS
- if (GNUNET_SYSERR == find_session (plugin, session))
- {
- LOG(GNUNET_ERROR_TYPE_ERROR, _("Trying to send with invalid session %p\n"));
- GNUNET_assert(0);
- return GNUNET_SYSERR;
- }
-#endif
/* create new message entry */
pm = GNUNET_malloc (sizeof (struct PendingMessage) + msgbuf_size);
pm->msg = (const char *) &pm[1];
LOG(GNUNET_ERROR_TYPE_DEBUG,
"Asked to transmit %u bytes to `%s', added message to list.\n",
- msgbuf_size, GNUNET_i2s (&session->target));
+ msgbuf_size,
+ GNUNET_i2s (&session->target));
if (GNUNET_YES ==
GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessionmap,
{
GNUNET_assert (NULL != session->client);
GNUNET_SERVER_client_set_timeout (session->client,
- GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
+ GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
GNUNET_STATISTICS_update (plugin->env->stats,
- gettext_noop ("# bytes currently in TCP buffers"), msgbuf_size,
- GNUNET_NO);
+ gettext_noop ("# bytes currently in TCP buffers"),
+ msgbuf_size,
+ GNUNET_NO);
/* append pm to pending_messages list */
GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head,
pm);
notify_session_monitor (session->plugin,
session,
- GNUNET_TRANSPORT_SS_UP);
+ GNUNET_TRANSPORT_SS_UPDATE);
session->msgs_in_queue++;
session->bytes_in_queue += pm->message_size;
process_pending_messages (session);
return msgbuf_size;
}
- else if (GNUNET_YES ==
- GNUNET_CONTAINER_multipeermap_contains_value (plugin->nat_wait_conns,
- &session->target,
- session))
+ if (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_contains_value (plugin->nat_wait_conns,
+ &session->target,
+ session))
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"This NAT WAIT session for peer `%s' is not yet ready!\n",
GNUNET_TRANSPORT_SS_HANDSHAKE);
return msgbuf_size;
}
- else
- {
- LOG(GNUNET_ERROR_TYPE_ERROR,
- "Invalid session %p\n",
- session);
- if (NULL != cont)
- cont (cont_cls,
- &session->target,
- GNUNET_SYSERR,
- pm->message_size,
- 0);
- GNUNET_break (0);
- GNUNET_free (pm);
- return GNUNET_SYSERR; /* session does not exist here */
- }
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Invalid session %p\n",
+ session);
+ if (NULL != cont)
+ cont (cont_cls,
+ &session->target,
+ GNUNET_SYSERR,
+ pm->message_size,
+ 0);
+ GNUNET_break (0);
+ GNUNET_free (pm);
+ return GNUNET_SYSERR; /* session does not exist here */
}
+
/**
* Closure for #session_lookup_it().
*/
const struct GNUNET_PeerIdentity *key,
void *value)
{
- struct SessionItCtx * si_ctx = cls;
- struct Session * session = value;
+ struct SessionItCtx *si_ctx = cls;
+ struct Session *session = value;
- if (0 != GNUNET_HELLO_address_cmp (si_ctx->address, session->address))
+ if (0 !=
+ GNUNET_HELLO_address_cmp (si_ctx->address,
+ session->address))
return GNUNET_YES;
- /* Found existing session */
si_ctx->result = session;
return GNUNET_NO;
}
{
struct Session *session = cls;
- session->nat_connection_timeout = GNUNET_SCHEDULER_NO_TASK;
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "NAT WAIT connection to `%4s' at `%s' could not be established, removing session\n",
- GNUNET_i2s (&session->target),
- tcp_address_to_string (NULL, session->address->address, session->address->address_length));
- tcp_disconnect_session (session->plugin, session);
+ session->nat_connection_timeout = NULL;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "NAT WAIT connection to `%4s' at `%s' could not be established, removing session\n",
+ GNUNET_i2s (&session->target),
+ tcp_plugin_address_to_string (session->plugin,
+ session->address->address,
+ session->address->address_length));
+ tcp_plugin_disconnect_session (session->plugin,
+ session);
}
+/**
+ * Function that will be called whenever the transport service wants to
+ * notify the plugin that a session is still active and in use and
+ * therefore the session timeout for this session has to be updated
+ *
+ * @param cls closure
+ * @param peer which peer was the session for
+ * @param session which session is being updated
+ */
static void
tcp_plugin_update_session_timeout (void *cls,
const struct GNUNET_PeerIdentity *peer,
struct Session *session)
{
- struct Plugin *plugin = cls;
-
- if (GNUNET_SYSERR == find_session (plugin, session))
- return;
reschedule_session_timeout (session);
}
+
/**
* Task to signal the server that we can continue
* receiving from the TCP client now.
*
- * @param cls the `struct Session*`
+ * @param cls the `struct Session *`
* @param tc task context (unused)
*/
static void
-delayed_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+delayed_done (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Session *session = cls;
- session->receive_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ session->receive_delay_task = NULL;
reschedule_session_timeout (session);
-
- GNUNET_SERVER_receive_done (session->client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (session->client,
+ GNUNET_OK);
}
+/**
+ * Function that will be called whenever the transport service wants to
+ * notify the plugin that the inbound quota changed and that the plugin
+ * should update it's delay for the next receive value
+ *
+ * @param cls closure
+ * @param peer which peer was the session for
+ * @param session which session is being updated
+ * @param delay new delay to use for receiving
+ */
static void
tcp_plugin_update_inbound_delay (void *cls,
const struct GNUNET_PeerIdentity *peer,
struct Session *session,
struct GNUNET_TIME_Relative delay)
{
- if (GNUNET_SCHEDULER_NO_TASK == session->receive_delay_task)
+ if (NULL == session->receive_delay_task)
return;
-
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "New inbound delay %llu us\n",delay.rel_value_us);
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "New inbound delay %s\n",
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_NO));
+ session->receive_delay = GNUNET_TIME_relative_to_absolute (delay);
GNUNET_SCHEDULER_cancel (session->receive_delay_task);
session->receive_delay_task = GNUNET_SCHEDULER_add_delayed (delay,
- &delayed_done, session);
+ &delayed_done,
+ session);
}
struct sockaddr_in6 a6;
const struct IPv4TcpAddress *t4;
const struct IPv6TcpAddress *t6;
- struct GNUNET_ATS_Information ats;
+ unsigned int options;
+ enum GNUNET_ATS_Network_Type net_type;
unsigned int is_natd = GNUNET_NO;
size_t addrlen;
+#ifdef TCP_STEALTH
+ struct GNUNET_NETWORK_Handle *s;
+#endif
addrlen = address->address_length;
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Trying to get session for `%s' address of peer `%s'\n",
- tcp_address_to_string(NULL, address->address, address->address_length),
- GNUNET_i2s (&address->peer));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to get session for `%s' address of peer `%s'\n",
+ tcp_plugin_address_to_string (plugin,
+ address->address,
+ address->address_length),
+ GNUNET_i2s (&address->peer));
- if (GNUNET_HELLO_address_check_option(address, GNUNET_HELLO_ADDRESS_INFO_INBOUND))
+ if (GNUNET_HELLO_address_check_option (address,
+ GNUNET_HELLO_ADDRESS_INFO_INBOUND))
{
GNUNET_break (0);
return NULL;
}
/* look for existing session */
- if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (plugin->sessionmap,
- &address->peer))
+ if (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_contains (plugin->sessionmap,
+ &address->peer))
{
struct SessionItCtx si_ctx;
si_ctx.address = address;
si_ctx.result = NULL;
-
GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap,
- &address->peer, &session_lookup_it, &si_ctx);
- if (si_ctx.result != NULL )
+ &address->peer,
+ &session_lookup_it,
+ &si_ctx);
+ if (NULL != si_ctx.result)
{
session = si_ctx.result;
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Found existing session for `%s' address `%s' session %p\n",
- GNUNET_i2s (&address->peer),
- tcp_address_to_string(NULL, address->address, address->address_length),
- session);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Found existing session for `%s' address `%s'\n",
+ GNUNET_i2s (&address->peer),
+ tcp_plugin_address_to_string (plugin,
+ address->address,
+ address->address_length));
return session;
}
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Existing sessions did not match address `%s' or peer `%s'\n",
- tcp_address_to_string(NULL, address->address, address->address_length),
- GNUNET_i2s (&address->peer));
}
if (addrlen == sizeof(struct IPv6TcpAddress))
{
- GNUNET_assert(NULL != address->address); /* make static analysis happy */
+ GNUNET_assert (NULL != address->address); /* make static analysis happy */
t6 = address->address;
+ options = t6->options;
af = AF_INET6;
memset (&a6, 0, sizeof(a6));
#if HAVE_SOCKADDR_IN_SIN_LEN
{
GNUNET_assert(NULL != address->address); /* make static analysis happy */
t4 = address->address;
+ options = t4->options;
af = AF_INET;
memset (&a4, 0, sizeof(a4));
#if HAVE_SOCKADDR_IN_SIN_LEN
}
else
{
- GNUNET_STATISTICS_update (plugin->env->stats, gettext_noop
- ("# requests to create session with invalid address"), 1, GNUNET_NO);
- return NULL ;
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# requests to create session with invalid address"),
+ 1,
+ GNUNET_NO);
+ return NULL;
}
- ats = plugin->env->get_address_type (plugin->env->cls, sb, sbs);
+ net_type = plugin->env->get_address_type (plugin->env->cls,
+ sb,
+ sbs);
+ GNUNET_break (net_type != GNUNET_ATS_NET_UNSPECIFIED);
- if ((is_natd == GNUNET_YES) && (addrlen == sizeof(struct IPv6TcpAddress)))
+ if ( (is_natd == GNUNET_YES) &&
+ (addrlen == sizeof(struct IPv6TcpAddress)) )
{
/* NAT client only works with IPv4 addresses */
- return NULL ;
+ return NULL;
}
if (plugin->cur_connections >= plugin->max_connections)
{
/* saturated */
- return NULL ;
+ return NULL;
}
- if ((is_natd == GNUNET_YES)
- && (GNUNET_YES
- == GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns,
- &address->peer)))
+ if ( (is_natd == GNUNET_YES) &&
+ (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns,
+ &address->peer)))
{
/* Only do one NAT punch attempt per peer identity */
- return NULL ;
+ return NULL;
}
- if ((is_natd == GNUNET_YES) && (NULL != plugin->nat) &&
- (GNUNET_NO == GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns,
- &address->peer)))
+ if ( (is_natd == GNUNET_YES) &&
+ (NULL != plugin->nat) &&
+ (GNUNET_NO ==
+ GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns,
+ &address->peer)))
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Found valid IPv4 NAT address (creating session)!\n");
- session = create_session (plugin, address, NULL, GNUNET_YES);
- session->ats_address_network_type = (enum GNUNET_ATS_Network_Type) ntohl (
- ats.value);
- GNUNET_break(
- session->ats_address_network_type != GNUNET_ATS_NET_UNSPECIFIED);
+ "Found valid IPv4 NAT address (creating session)!\n");
+ session = create_session (plugin,
+ address,
+ net_type,
+ NULL,
+ GNUNET_YES);
session->nat_connection_timeout = GNUNET_SCHEDULER_add_delayed (NAT_TIMEOUT,
- &nat_connect_timeout, session);
- GNUNET_assert(session != NULL);
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multipeermap_put (plugin->nat_wait_conns,
- &session->target, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
-
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Created NAT WAIT connection to `%4s' at `%s'\n",
- GNUNET_i2s (&session->target), GNUNET_a2s (sb, sbs));
+ &nat_connect_timeout,
+ session);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multipeermap_put (plugin->nat_wait_conns,
+ &session->target,
+ session,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Created NAT WAIT connection to `%4s' at `%s'\n",
+ GNUNET_i2s (&session->target),
+ GNUNET_a2s (sb, sbs));
if (GNUNET_OK == GNUNET_NAT_run_client (plugin->nat, &a4))
+ {
return session;
+ }
else
{
LOG(GNUNET_ERROR_TYPE_DEBUG,
"Running NAT client for `%4s' at `%s' failed\n",
- GNUNET_i2s (&session->target), GNUNET_a2s (sb, sbs));
- tcp_disconnect_session (plugin, session);
- return NULL ;
+ GNUNET_i2s (&session->target),
+ GNUNET_a2s (sb, sbs));
+ tcp_plugin_disconnect_session (plugin,
+ session);
+ return NULL;
}
}
/* create new outbound session */
- GNUNET_assert(plugin->cur_connections <= plugin->max_connections);
- sa = GNUNET_CONNECTION_create_from_sockaddr (af, sb, sbs);
+ if (0 != (options & TCP_OPTIONS_TCP_STEALTH))
+ {
+#ifdef TCP_STEALTH
+ s = GNUNET_NETWORK_socket_create (af, SOCK_STREAM, 0);
+ if (NULL == s)
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
+ "socket");
+ sa = NULL;
+ }
+ else
+ {
+ if ( (GNUNET_OK !=
+ GNUNET_NETWORK_socket_setsockopt (s,
+ IPPROTO_TCP,
+ TCP_STEALTH,
+ &session->target,
+ sizeof (struct GNUNET_PeerIdentity))) ||
+ (GNUNET_OK !=
+ GNUNET_NETWORK_socket_setsockopt (s,
+ IPPROTO_TCP,
+ TCP_STEALTH_INTEGRITY,
+ &plugin->my_welcome,
+ sizeof (struct WelcomeMessage))) )
+ {
+ /* TCP STEALTH not supported by kernel */
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_NETWORK_socket_close (s));
+ sa = NULL;
+ }
+ else
+ {
+ sa = GNUNET_CONNECTION_connect_socket (s, sb, sbs);
+ }
+ }
+#else
+ sa = NULL;
+#endif
+ }
+ else
+ {
+ sa = GNUNET_CONNECTION_create_from_sockaddr (af, sb, sbs);
+ }
if (NULL == sa)
{
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Failed to create connection to `%4s' at `%s'\n",
- GNUNET_i2s (&address->peer), GNUNET_a2s (sb, sbs));
- return NULL ;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to create connection to `%4s' at `%s'\n",
+ GNUNET_i2s (&address->peer),
+ GNUNET_a2s (sb, sbs));
+ return NULL;
}
- plugin->cur_connections++;
- if (plugin->cur_connections == plugin->max_connections)
- GNUNET_SERVER_suspend (plugin->server); /* Maximum number of connections rechead */
-
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Asked to transmit to `%4s', creating fresh session using address `%s'.\n",
- GNUNET_i2s (&address->peer), GNUNET_a2s (sb, sbs));
-
- session = create_session (plugin, address,
- GNUNET_SERVER_connect_socket (plugin->server, sa), GNUNET_NO);
- session->ats_address_network_type = (enum GNUNET_ATS_Network_Type) ntohl (
- ats.value);
- GNUNET_break(session->ats_address_network_type != GNUNET_ATS_NET_UNSPECIFIED);
- GNUNET_SERVER_client_set_user_context(session->client, session);
- GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap, &session->target,
- session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Creating new session for `%s' address `%s' session %p\n",
- GNUNET_i2s (&address->peer),
- tcp_address_to_string(NULL, address->address, address->address_length),
- session);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Asked to transmit to `%4s', creating fresh session using address `%s'.\n",
+ GNUNET_i2s (&address->peer),
+ GNUNET_a2s (sb, sbs));
+
+ session = create_session (plugin,
+ address,
+ net_type,
+ GNUNET_SERVER_connect_socket (plugin->server,
+ sa),
+ GNUNET_NO);
+ (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap,
+ &session->target,
+ session,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
/* Send TCP Welcome */
process_pending_messages (session);
}
+/**
+ * We have been asked to destroy all connections to a particular peer.
+ * This function is called on each applicable session and must tear it
+ * down.
+ *
+ * @param cls the `struct Plugin *`
+ * @param key the peer which the session belongs to (unused)
+ * @param value the `struct Session`
+ * @return #GNUNET_YES (continue to iterate)
+ */
static int
session_disconnect_it (void *cls,
const struct GNUNET_PeerIdentity *key,
struct Plugin *plugin = cls;
struct Session *session = value;
- GNUNET_STATISTICS_update (session->plugin->env->stats, gettext_noop
- ("# transport-service disconnect requests for TCP"), 1, GNUNET_NO);
- tcp_disconnect_session (plugin, session);
+ GNUNET_STATISTICS_update (session->plugin->env->stats,
+ gettext_noop ("# transport-service disconnect requests for TCP"),
+ 1,
+ GNUNET_NO);
+ tcp_plugin_disconnect_session (plugin,
+ session);
return GNUNET_YES;
}
{
struct Plugin *plugin = cls;
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Disconnecting peer `%4s'\n",
- GNUNET_i2s (target));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting peer `%4s'\n",
+ GNUNET_i2s (target));
GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap,
target,
&session_disconnect_it,
/**
- * Running pretty printers: head
- */
-static struct PrettyPrinterContext *ppc_dll_head;
-
-/**
- * Running pretty printers: tail
- */
-static struct PrettyPrinterContext *ppc_dll_tail;
-
-/**
- * Context for address to string conversion, closure
- * for #append_port().
- */
-struct PrettyPrinterContext
-{
- /**
- * DLL
- */
- struct PrettyPrinterContext *next;
-
- /**
- * DLL
- */
- struct PrettyPrinterContext *prev;
-
- /**
- * Timeout task
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
- /**
- * Resolver handle
- */
- struct GNUNET_RESOLVER_RequestHandle *resolver_handle;
-
- /**
- * Function to call with the result.
- */
- GNUNET_TRANSPORT_AddressStringCallback asc;
-
- /**
- * Clsoure for @e asc.
- */
- void *asc_cls;
-
- /**
- * Port to add after the IP address.
- */
- uint16_t port;
-
- /**
- * IPv6 address
- */
- int ipv6;
-
- /**
- * Options
- */
- uint32_t options;
-};
-
-
-/**
- * Append our port and forward the result.
+ * We are processing an address pretty printing request and finished
+ * the IP resolution (if applicable). Append our port and forward the
+ * result. If called with @a hostname NULL, we are done and should
+ * clean up the pretty printer (otherwise, there might be multiple
+ * hostnames for the IP address and we might receive more).
*
* @param cls the `struct PrettyPrinterContext *`
* @param hostname hostname part of the address
const char *hostname)
{
struct PrettyPrinterContext *ppc = cls;
+ struct Plugin *plugin = ppc->plugin;
char *ret;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "append_port called with hostname `%s'\n",
+ hostname);
if (NULL == hostname)
{
/* Final call, done */
ppc->resolver_handle = NULL;
- GNUNET_CONTAINER_DLL_remove (ppc_dll_head,
- ppc_dll_tail,
+ GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head,
+ plugin->ppc_dll_tail,
ppc);
ppc->asc (ppc->asc_cls,
NULL,
/**
- * Convert the transports address to a nice, human-readable
- * format.
+ * Convert the transports address to a nice, human-readable format.
*
- * @param cls closure
+ * @param cls closure with the `struct Plugin`
* @param type name of the transport that generated the address
* @param addr one of the addresses of the host, NULL for the last address
* the specific address format depends on the transport
GNUNET_TRANSPORT_AddressStringCallback asc,
void *asc_cls)
{
+ struct Plugin *plugin = cls;
struct PrettyPrinterContext *ppc;
const void *sb;
size_t sbs;
else
{
/* invalid address */
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ _("Unexpected address length: %u bytes\n"),
+ (unsigned int) addrlen);
asc (asc_cls, NULL, GNUNET_SYSERR);
asc (asc_cls, NULL, GNUNET_OK);
return;
}
ppc = GNUNET_new (struct PrettyPrinterContext);
+ ppc->plugin = plugin;
if (addrlen == sizeof(struct IPv6TcpAddress))
ppc->ipv6 = GNUNET_YES;
else
ppc->asc_cls = asc_cls;
ppc->port = port;
ppc->options = options;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting DNS reverse lookup\n");
ppc->resolver_handle = GNUNET_RESOLVER_hostname_get (sb,
sbs,
! numeric,
GNUNET_free (ppc);
return;
}
- GNUNET_CONTAINER_DLL_insert (ppc_dll_head,
- ppc_dll_tail,
+ GNUNET_CONTAINER_DLL_insert (plugin->ppc_dll_head,
+ plugin->ppc_dll_tail,
ppc);
}
* @return #GNUNET_OK if port is either open_port or adv_port
*/
static int
-check_port (struct Plugin *plugin, uint16_t in_port)
+check_port (struct Plugin *plugin,
+ uint16_t in_port)
{
- if ((in_port == plugin->adv_port) || (in_port == plugin->open_port))
+ if ( (in_port == plugin->adv_port) ||
+ (in_port == plugin->open_port) )
return GNUNET_OK;
return GNUNET_SYSERR;
}
+
/**
* 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
*
* @param cls closure, our `struct Plugin *`
* @param addr pointer to the address
- * @param addrlen length of addr
+ * @param addrlen length of @a addr
* @return #GNUNET_OK if this is a plausible address for this peer
* and transport, #GNUNET_SYSERR if not
*/
static int
-tcp_plugin_check_address (void *cls, const void *addr, size_t addrlen)
+tcp_plugin_check_address (void *cls,
+ const void *addr,
+ size_t addrlen)
{
struct Plugin *plugin = cls;
- struct IPv4TcpAddress *v4;
- struct IPv6TcpAddress *v6;
+ const struct IPv4TcpAddress *v4;
+ const struct IPv6TcpAddress *v6;
- if ((addrlen != sizeof(struct IPv4TcpAddress))
- && (addrlen != sizeof(struct IPv6TcpAddress)))
+ if ( (addrlen != sizeof(struct IPv4TcpAddress)) &&
+ (addrlen != sizeof(struct IPv6TcpAddress)) )
{
- GNUNET_break_op(0);
+ GNUNET_break_op (0);
return GNUNET_SYSERR;
}
if (addrlen == sizeof(struct IPv4TcpAddress))
{
- v4 = (struct IPv4TcpAddress *) addr;
+ v4 = (const struct IPv4TcpAddress *) addr;
if (0 != memcmp (&v4->options,
&plugin->myoptions,
sizeof(uint32_t)))
{
- GNUNET_break(0);
+ GNUNET_break (0);
return GNUNET_SYSERR;
}
- if (GNUNET_OK != check_port (plugin, ntohs (v4->t4_port)))
+ if (GNUNET_OK != check_port (plugin,
+ ntohs (v4->t4_port)))
return GNUNET_SYSERR;
- if (GNUNET_OK
- != GNUNET_NAT_test_address (plugin->nat, &v4->ipv4_addr,
- sizeof(struct in_addr)))
+ if (GNUNET_OK !=
+ GNUNET_NAT_test_address (plugin->nat,
+ &v4->ipv4_addr,
+ sizeof (struct in_addr)))
return GNUNET_SYSERR;
}
else
{
- v6 = (struct IPv6TcpAddress *) addr;
+ v6 = (const struct IPv6TcpAddress *) addr;
if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr))
{
- GNUNET_break_op(0);
+ GNUNET_break_op (0);
return GNUNET_SYSERR;
}
if (0 != memcmp (&v6->options,
&plugin->myoptions,
sizeof (uint32_t)))
{
- GNUNET_break(0);
+ GNUNET_break (0);
return GNUNET_SYSERR;
}
- if (GNUNET_OK != check_port (plugin, ntohs (v6->t6_port)))
+ if (GNUNET_OK != check_port (plugin,
+ ntohs (v6->t6_port)))
return GNUNET_SYSERR;
- if (GNUNET_OK
- != GNUNET_NAT_test_address (plugin->nat, &v6->ipv6_addr,
- sizeof(struct in6_addr)))
+ if (GNUNET_OK !=
+ GNUNET_NAT_test_address (plugin->nat,
+ &v6->ipv6_addr,
+ sizeof(struct in6_addr)))
return GNUNET_SYSERR;
}
return GNUNET_OK;
}
+
/**
* We've received a nat probe from this peer via TCP. Finish
* creating the client session and resume sending of queued
const struct sockaddr_in *s4;
const struct sockaddr_in6 *s6;
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Received NAT probe\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Received NAT probe\n");
/* We have received a TCP NAT probe, meaning we (hopefully) initiated
* a connection to this peer by running gnunet-nat-client. This peer
* received the punch message and now wants us to use the new connection
if (ntohs (message->size) != sizeof(struct TCP_NAT_ProbeMessage))
{
GNUNET_break_op(0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
sizeof(struct GNUNET_PeerIdentity)))
{
/* refuse connections from ourselves */
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
session = GNUNET_CONTAINER_multipeermap_get (plugin->nat_wait_conns,
- &tcp_nat_probe->clientIdentity);
- if (session == NULL )
+ &tcp_nat_probe->clientIdentity);
+ if (NULL == session)
{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Did NOT find session for NAT probe!\n");
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Did NOT find session for NAT probe!\n");
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
return;
}
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Found session for NAT probe!\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Found session for NAT probe!\n");
- if (session->nat_connection_timeout != GNUNET_SCHEDULER_NO_TASK )
+ if (NULL != session->nat_connection_timeout)
{
GNUNET_SCHEDULER_cancel (session->nat_connection_timeout);
- session->nat_connection_timeout = GNUNET_SCHEDULER_NO_TASK;
+ session->nat_connection_timeout = NULL;
}
- if (GNUNET_OK != GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
+ if (GNUNET_OK !=
+ GNUNET_SERVER_client_get_address (client,
+ &vaddr,
+ &alen))
{
GNUNET_break(0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- tcp_disconnect_session (plugin, session);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
+ tcp_plugin_disconnect_session (plugin,
+ session);
return;
}
- GNUNET_assert(
- GNUNET_CONTAINER_multipeermap_remove (plugin->nat_wait_conns, &tcp_nat_probe->clientIdentity, session) == GNUNET_YES);
- GNUNET_SERVER_client_set_user_context(client, session);
- GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap, &session->target,
- session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multipeermap_remove (plugin->nat_wait_conns,
+ &tcp_nat_probe->clientIdentity,
+ session));
+ GNUNET_SERVER_client_set_user_context (client,
+ session);
+ (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap,
+ &session->target,
+ session,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
session->last_activity = GNUNET_TIME_absolute_get ();
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Found address `%s' for incoming connection\n",
- GNUNET_a2s (vaddr, alen));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Found address `%s' for incoming connection\n",
+ GNUNET_a2s (vaddr, alen));
switch (((const struct sockaddr *) vaddr)->sa_family)
{
case AF_INET:
s4 = vaddr;
t4 = GNUNET_new (struct IPv4TcpAddress);
- t4->options = htonl(0);
+ t4->options = htonl (TCP_OPTIONS_NONE);
t4->t4_port = s4->sin_port;
t4->ipv4_addr = s4->sin_addr.s_addr;
- session->address = GNUNET_HELLO_address_allocate (
- &tcp_nat_probe->clientIdentity, PLUGIN_NAME, &t4,
- sizeof(struct IPv4TcpAddress),
- GNUNET_HELLO_ADDRESS_INFO_NONE);
+ session->address = GNUNET_HELLO_address_allocate (&tcp_nat_probe->clientIdentity,
+ PLUGIN_NAME,
+ &t4,
+ sizeof(struct IPv4TcpAddress),
+ GNUNET_HELLO_ADDRESS_INFO_NONE);
break;
case AF_INET6:
s6 = vaddr;
t6 = GNUNET_new (struct IPv6TcpAddress);
- t6->options = htonl(0);
+ t6->options = htonl (TCP_OPTIONS_NONE);
t6->t6_port = s6->sin6_port;
memcpy (&t6->ipv6_addr, &s6->sin6_addr, sizeof(struct in6_addr));
- session->address = GNUNET_HELLO_address_allocate (
- &tcp_nat_probe->clientIdentity,
- PLUGIN_NAME, &t6, sizeof(struct IPv6TcpAddress),
- GNUNET_HELLO_ADDRESS_INFO_NONE);
+ session->address = GNUNET_HELLO_address_allocate (&tcp_nat_probe->clientIdentity,
+ PLUGIN_NAME,
+ &t6,
+ sizeof(struct IPv6TcpAddress),
+ GNUNET_HELLO_ADDRESS_INFO_NONE);
break;
default:
GNUNET_break_op(0);
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Bad address for incoming connection!\n");
+ LOG(GNUNET_ERROR_TYPE_DEBUG,
+ "Bad address for incoming connection!\n");
GNUNET_free(vaddr);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- tcp_disconnect_session (plugin, session);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
+ tcp_plugin_disconnect_session (plugin,
+ session);
return;
}
- GNUNET_free(vaddr);
- GNUNET_break(NULL == session->client);
- GNUNET_SERVER_client_keep (client);
+ GNUNET_free (vaddr);
+ GNUNET_break (NULL == session->client);
session->client = client;
GNUNET_STATISTICS_update (plugin->env->stats,
- gettext_noop ("# TCP sessions active"), 1, GNUNET_NO);
+ gettext_noop ("# TCP sessions active"),
+ 1,
+ GNUNET_NO);
process_pending_messages (session);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
+
/**
* We've received a welcome from this peer via TCP. Possibly create a
* fresh client record and send back our welcome.
struct IPv6TcpAddress t6;
const struct sockaddr_in *s4;
const struct sockaddr_in6 *s6;
- struct GNUNET_ATS_Information ats;
-
- if (0 == memcmp (&wm->clientIdentity, plugin->env->my_identity,
- sizeof(struct GNUNET_PeerIdentity)))
+ if (0 == memcmp (&wm->clientIdentity,
+ plugin->env->my_identity,
+ sizeof(struct GNUNET_PeerIdentity)))
{
/* refuse connections from ourselves */
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
+ if (GNUNET_OK ==
+ GNUNET_SERVER_client_get_address (client,
+ &vaddr,
+ &alen))
{
- LOG(GNUNET_ERROR_TYPE_INFO,
- "Received %s message from my own identity `%4s' on address `%s'\n",
- "WELCOME", GNUNET_i2s (&wm->clientIdentity),
- GNUNET_a2s (vaddr, alen));
+ LOG (GNUNET_ERROR_TYPE_INFO,
+ "Received WELCOME message from my own identity `%4s' on address `%s'\n",
+ GNUNET_i2s (&wm->clientIdentity),
+ GNUNET_a2s (vaddr, alen));
GNUNET_free(vaddr);
}
return;
}
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Received %s message from `%4s' %p\n", "WELCOME",
- GNUNET_i2s (&wm->clientIdentity), client);
+ LOG(GNUNET_ERROR_TYPE_DEBUG,
+ "Received WELCOME message from `%4s' %p\n",
+ GNUNET_i2s (&wm->clientIdentity),
+ client);
GNUNET_STATISTICS_update (plugin->env->stats,
- gettext_noop ("# TCP WELCOME messages received"), 1, GNUNET_NO);
+ gettext_noop ("# TCP WELCOME messages received"),
+ 1,
+ GNUNET_NO);
session = lookup_session_by_client (plugin, client);
if (NULL != session)
{
- if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
+ if (GNUNET_OK ==
+ GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
{
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Found existing session %p for peer `%s'\n",
- session, GNUNET_a2s (vaddr, alen));
- GNUNET_free(vaddr);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Found existing session %p for peer `%s'\n",
+ session,
+ GNUNET_a2s (vaddr, alen));
+ GNUNET_free (vaddr);
}
}
else
{
- GNUNET_SERVER_client_keep (client);
- if (NULL != plugin->service) /* Otherwise value is incremented in tcp_access_check */
- plugin->cur_connections++;
- if (plugin->cur_connections == plugin->max_connections)
- GNUNET_SERVER_suspend (plugin->server); /* Maximum number of connections rechead */
-
- if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
+ if (GNUNET_OK ==
+ GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
{
if (alen == sizeof(struct sockaddr_in))
{
s4 = vaddr;
memset (&t4, '\0', sizeof (t4));
- t4.options = htonl (0);
+ t4.options = htonl (TCP_OPTIONS_NONE);
t4.t4_port = s4->sin_port;
t4.ipv4_addr = s4->sin_addr.s_addr;
address = GNUNET_HELLO_address_allocate (&wm->clientIdentity,
- PLUGIN_NAME, &t4, sizeof(t4),
- GNUNET_HELLO_ADDRESS_INFO_INBOUND);
+ PLUGIN_NAME,
+ &t4,
+ sizeof(t4),
+ GNUNET_HELLO_ADDRESS_INFO_INBOUND);
}
else if (alen == sizeof(struct sockaddr_in6))
{
s6 = vaddr;
memset (&t6, '\0', sizeof (t6));
- t6.options = htonl (0);
+ t6.options = htonl (TCP_OPTIONS_NONE);
t6.t6_port = s6->sin6_port;
memcpy (&t6.ipv6_addr, &s6->sin6_addr, sizeof(struct in6_addr));
address = GNUNET_HELLO_address_allocate (&wm->clientIdentity,
- PLUGIN_NAME, &t6, sizeof (t6),
- GNUNET_HELLO_ADDRESS_INFO_INBOUND);
+ PLUGIN_NAME,
+ &t6,
+ sizeof (t6),
+ GNUNET_HELLO_ADDRESS_INFO_INBOUND);
}
else
{
GNUNET_break (0);
GNUNET_free_non_null (vaddr);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
- session = create_session (plugin, address, client, GNUNET_NO);
+ session = create_session (plugin,
+ address,
+ plugin->env->get_address_type (plugin->env->cls,
+ vaddr,
+ alen),
+ client,
+ GNUNET_NO);
+ GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != session->scope);
GNUNET_HELLO_address_free (address);
- ats = plugin->env->get_address_type (plugin->env->cls, vaddr, alen);
- session->ats_address_network_type = (enum GNUNET_ATS_Network_Type) ntohl (
- ats.value);
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Creating new%s session %p for peer `%s' client %p \n",
- GNUNET_HELLO_address_check_option (session->address,
- GNUNET_HELLO_ADDRESS_INFO_INBOUND) ? " inbound" : "", session,
- tcp_address_to_string(NULL, (void *) session->address->address,
- session->address->address_length),
- client);
- GNUNET_free(vaddr);
- GNUNET_SERVER_client_set_user_context(session->client, session);
- GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap, &session->target,
- session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating new%s session %p for peer `%s' client %p\n",
+ GNUNET_HELLO_address_check_option (session->address,
+ GNUNET_HELLO_ADDRESS_INFO_INBOUND)
+ ? " inbound" : "",
+ session,
+ tcp_plugin_address_to_string (plugin,
+ session->address->address,
+ session->address->address_length),
+ client);
+ GNUNET_free (vaddr);
+ (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap,
+ &session->target,
+ session,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
/* Notify transport and ATS about new session */
- plugin->env->session_start (NULL, session->address, session, &ats, 1);
+ plugin->env->session_start (plugin->env->cls,
+ session->address,
+ session,
+ session->scope);
}
else
{
LOG(GNUNET_ERROR_TYPE_DEBUG,
"Did not obtain TCP socket address for incoming connection\n");
GNUNET_break(0);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
}
if (session->expecting_welcome != GNUNET_YES)
{
GNUNET_break_op(0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
GNUNET_break(0);
return;
}
process_pending_messages (session);
GNUNET_SERVER_client_set_timeout (client,
- GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
uint16_t type;
type = ntohs (message->type);
- if ((GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME == type)
- || (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE == type))
+ if ( (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME == type) ||
+ (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE == type) )
{
/* We don't want to propagate WELCOME and NAT Probe messages up! */
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
return;
}
session = lookup_session_by_client (plugin, client);
void *vaddr;
size_t alen;
- GNUNET_SERVER_client_get_address (client, &vaddr, &alen);
- LOG(GNUNET_ERROR_TYPE_ERROR,
- "Received unexpected %u bytes of type %u from `%s'\n",
- (unsigned int ) ntohs (message->size),
- (unsigned int ) ntohs (message->type), GNUNET_a2s (vaddr, alen));
+ GNUNET_SERVER_client_get_address (client,
+ &vaddr,
+ &alen);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Received unexpected %u bytes of type %u from `%s'\n",
+ (unsigned int) ntohs (message->size),
+ (unsigned int) ntohs (message->type),
+ GNUNET_a2s (vaddr,
+ alen));
GNUNET_break_op(0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- GNUNET_free_non_null(vaddr);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
+ GNUNET_free_non_null (vaddr);
return;
}
- else if (GNUNET_YES == session->expecting_welcome)
+ if (GNUNET_YES == session->expecting_welcome)
{
/* Session is expecting WELCOME message */
void *vaddr;
size_t alen;
GNUNET_SERVER_client_get_address (client, &vaddr, &alen);
- LOG(GNUNET_ERROR_TYPE_ERROR,
- "Received unexpected %u bytes of type %u from `%s'\n",
- (unsigned int ) ntohs (message->size),
- (unsigned int ) ntohs (message->type), GNUNET_a2s (vaddr, alen));
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "Received unexpected %u bytes of type %u from `%s'\n",
+ (unsigned int) ntohs (message->size),
+ (unsigned int) ntohs (message->type),
+ GNUNET_a2s (vaddr, alen));
GNUNET_break_op(0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- GNUNET_free_non_null(vaddr);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
+ GNUNET_free_non_null (vaddr);
return;
}
session->last_activity = GNUNET_TIME_absolute_get ();
- 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->type), GNUNET_i2s (&session->target));
+ 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->type),
+ GNUNET_i2s (&session->target));
GNUNET_STATISTICS_update (plugin->env->stats,
- gettext_noop ("# bytes received via TCP"), ntohs (message->size),
- GNUNET_NO);
- struct GNUNET_ATS_Information distance;
-
- distance.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- distance.value = htonl ((uint32_t) session->ats_address_network_type);
- GNUNET_break(session->ats_address_network_type != GNUNET_ATS_NET_UNSPECIFIED);
-
- GNUNET_assert(GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessionmap,
- &session->target,
- session));
+ gettext_noop ("# bytes received via TCP"),
+ ntohs (message->size),
+ GNUNET_NO);
+ GNUNET_assert (GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessionmap,
+ &session->target,
+ session));
delay = plugin->env->receive (plugin->env->cls,
session->address,
session,
message);
- plugin->env->update_address_metrics (plugin->env->cls,
- session->address,
- session,
- &distance, 1);
reschedule_session_timeout (session);
if (0 == delay.rel_value_us)
{
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
else
{
- LOG(GNUNET_ERROR_TYPE_DEBUG,
- "Throttling receiving from `%s' for %s\n",
- GNUNET_i2s (&session->target),
- GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Throttling receiving from `%s' for %s\n",
+ GNUNET_i2s (&session->target),
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
GNUNET_SERVER_disable_receive_done_warning (client);
+ GNUNET_assert (NULL == session->receive_delay_task);
session->receive_delay_task = GNUNET_SCHEDULER_add_delayed (delay,
- &delayed_done, session);
+ &delayed_done,
+ session);
}
}
/**
- * Functions with this signature are called whenever a peer
- * is disconnected on the network level.
+ * Function called whenever a peer is connected on the "SERVER" level.
+ * Increments number of active connections and suspends server if we
+ * have reached the limit.
+ *
+ * @param cls closure
+ * @param client identification of the client
+ */
+static void
+connect_notify (void *cls,
+ struct GNUNET_SERVER_Client *client)
+{
+ struct Plugin *plugin = cls;
+
+ if (NULL == client)
+ return;
+ plugin->cur_connections++;
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ gettext_noop ("# TCP server connections active"),
+ plugin->cur_connections,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# TCP server connect events"),
+ 1,
+ GNUNET_NO);
+ if (plugin->cur_connections != plugin->max_connections)
+ return;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("TCP connection limit reached, suspending server\n"));
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# TCP service suspended"),
+ 1,
+ GNUNET_NO);
+ GNUNET_SERVER_suspend (plugin->server); /* Maximum number of connections rechead */
+}
+
+
+/**
+ * Function called whenever a peer is disconnected on the "SERVER"
+ * level. Cleans up the connection, decrements number of active
+ * connections and if applicable resumes listening.
*
* @param cls closure
* @param client identification of the client
*/
static void
-disconnect_notify (void *cls, struct GNUNET_SERVER_Client *client)
+disconnect_notify (void *cls,
+ struct GNUNET_SERVER_Client *client)
{
struct Plugin *plugin = cls;
struct Session *session;
if (NULL == client)
return;
- session = lookup_session_by_client (plugin, client);
+ GNUNET_assert (plugin->cur_connections >= 1);
+ plugin->cur_connections--;
+ session = lookup_session_by_client (plugin,
+ client);
if (NULL == session)
return; /* unknown, nothing to do */
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Destroying session of `%4s' with %s due to network-level disconnect.\n",
GNUNET_i2s (&session->target),
- tcp_address_to_string (session->plugin, session->address->address,
- session->address->address_length));
+ tcp_plugin_address_to_string (session->plugin,
+ session->address->address,
+ session->address->address_length));
if (plugin->cur_connections == plugin->max_connections)
+ {
+ GNUNET_STATISTICS_update (session->plugin->env->stats,
+ gettext_noop ("# TCP service resumed"),
+ 1,
+ GNUNET_NO);
GNUNET_SERVER_resume (plugin->server); /* Resume server */
-
- if (plugin->cur_connections < 1)
- GNUNET_break(0);
- else
- plugin->cur_connections--;
-
- GNUNET_STATISTICS_update (session->plugin->env->stats, gettext_noop
- ("# network-level TCP disconnect events"),
+ }
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ gettext_noop ("# TCP server connections active"),
+ plugin->cur_connections,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (session->plugin->env->stats,
+ gettext_noop ("# network-level TCP disconnect events"),
1,
GNUNET_NO);
- tcp_disconnect_session (plugin, session);
+ tcp_plugin_disconnect_session (plugin,
+ session);
}
/**
* We can now send a probe message, copy into buffer to really send.
*
- * @param cls closure, a struct TCPProbeContext
+ * @param cls closure, a `struct TCPProbeContext`
* @param size max size to copy
* @param buf buffer to copy message to
* @return number of bytes copied into @a buf
GNUNET_CONTAINER_DLL_remove (plugin->probe_head,
plugin->probe_tail,
tcp_probe_ctx);
- if (buf == NULL)
+ if (NULL == buf)
{
GNUNET_CONNECTION_destroy (tcp_probe_ctx->sock);
GNUNET_free(tcp_probe_ctx);
return 0;
}
GNUNET_assert(size >= sizeof(tcp_probe_ctx->message));
- memcpy (buf, &tcp_probe_ctx->message, sizeof(tcp_probe_ctx->message));
+ memcpy (buf,
+ &tcp_probe_ctx->message,
+ sizeof(tcp_probe_ctx->message));
GNUNET_SERVER_connect_socket (tcp_probe_ctx->plugin->server,
tcp_probe_ctx->sock);
ret = sizeof(tcp_probe_ctx->message);
- GNUNET_free(tcp_probe_ctx);
+ GNUNET_free (tcp_probe_ctx);
return ret;
}
* We have received an ICMP response, ostensibly from a peer
* that wants to connect to us! Send a message to establish a connection.
*/
- sock = GNUNET_CONNECTION_create_from_sockaddr (AF_INET, addr, addrlen);
- if (sock == NULL )
+ sock = GNUNET_CONNECTION_create_from_sockaddr (AF_INET,
+ addr,
+ addrlen);
+ if (NULL == sock)
{
/* failed for some odd reason (out of sockets?); ignore attempt */
return;
}
tcp_probe_ctx = GNUNET_new (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));
+ 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);
+ tcp_probe_ctx->message.clientIdentity
+ = *plugin->env->my_identity;
tcp_probe_ctx->plugin = plugin;
tcp_probe_ctx->sock = sock;
GNUNET_CONTAINER_DLL_insert (plugin->probe_head,
plugin->probe_tail,
tcp_probe_ctx);
- tcp_probe_ctx->transmit_handle = GNUNET_CONNECTION_notify_transmit_ready (
- sock, ntohs (tcp_probe_ctx->message.header.size),
- GNUNET_TIME_UNIT_FOREVER_REL, ¬ify_send_probe, tcp_probe_ctx);
-
+ tcp_probe_ctx->transmit_handle
+ = GNUNET_CONNECTION_notify_transmit_ready (sock,
+ ntohs (tcp_probe_ctx->message.header.size),
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ ¬ify_send_probe,
+ tcp_probe_ctx);
}
/**
* Function obtain the network type for a session
*
- * @param cls closure ('struct Plugin*')
+ * @param cls closure (`struct Plugin *`)
* @param session the session
* @return the network type in HBO or #GNUNET_SYSERR
*/
static enum GNUNET_ATS_Network_Type
-tcp_get_network (void *cls,
- struct Session *session)
+tcp_plugin_get_network (void *cls,
+ struct Session *session)
{
- struct Plugin * plugin = cls;
-
- GNUNET_assert (NULL != plugin);
- GNUNET_assert (NULL != session);
- if (GNUNET_SYSERR == find_session (plugin,session))
- return GNUNET_ATS_NET_UNSPECIFIED;
- return session->ats_address_network_type;
+ return session->scope;
}
struct Plugin *plugin = cls;
struct Session *session = value;
+ notify_session_monitor (plugin,
+ session,
+ GNUNET_TRANSPORT_SS_INIT);
+ /* FIXME: cannot tell if this is up or not from current
+ session state... */
notify_session_monitor (plugin,
session,
GNUNET_TRANSPORT_SS_UP);
/**
* Entry point for the plugin.
*
- * @param cls closure, the 'struct GNUNET_TRANSPORT_PluginEnvironment*'
- * @return the 'struct GNUNET_TRANSPORT_PluginFunctions*' or NULL on error
+ * @param cls closure, the `struct GNUNET_TRANSPORT_PluginEnvironment *`
+ * @return the `struct GNUNET_TRANSPORT_PluginFunctions *` or NULL on error
*/
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) },
+ 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) },
+ 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 }
unsigned long long max_connections;
unsigned int i;
struct GNUNET_TIME_Relative idle_timeout;
+#ifdef TCP_STEALTH
+ struct GNUNET_NETWORK_Handle *const*lsocks;
+#endif
int ret;
int ret_s;
struct sockaddr **addrs;
api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
api->cls = NULL;
api->address_pretty_printer = &tcp_plugin_address_pretty_printer;
- api->address_to_string = &tcp_address_to_string;
- api->string_to_address = &tcp_string_to_address;
+ api->address_to_string = &tcp_plugin_address_to_string;
+ api->string_to_address = &tcp_plugin_string_to_address;
return api;
}
max_connections = 128;
aport = 0;
- if ((GNUNET_OK
- != GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-tcp",
- "PORT", &bport)) || (bport > 65535)
- || ((GNUNET_OK
- == GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-tcp",
- "ADVERTISED-PORT", &aport)) && (aport > 65535)))
+ if ((GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-tcp",
+ "PORT", &bport)) ||
+ (bport > 65535) ||
+ ((GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-tcp",
+ "ADVERTISED-PORT", &aport)) &&
+ (aport > 65535) ))
{
LOG(GNUNET_ERROR_TYPE_ERROR,
_("Require valid port number for service `%s' in configuration!\n"),
"transport-tcp");
return NULL ;
}
- if (aport == 0)
+ if (0 == aport)
aport = bport;
- if (bport == 0)
+ if (0 == bport)
aport = 0;
- if (bport != 0)
+ if (0 != bport)
{
service = GNUNET_SERVICE_start ("transport-tcp",
env->cfg,
GNUNET_SERVICE_OPTION_NONE);
- if (service == NULL)
+ if (NULL == service)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
_("Failed to start service.\n"));
else
service = NULL;
+ api = NULL;
plugin = GNUNET_new (struct Plugin);
plugin->sessionmap = GNUNET_CONTAINER_multipeermap_create (max_connections,
- GNUNET_YES);
+ GNUNET_YES);
plugin->max_connections = max_connections;
plugin->open_port = bport;
plugin->adv_port = aport;
plugin->env = env;
- if ( (service != NULL) &&
+ plugin->my_welcome.header.size = htons (sizeof(struct WelcomeMessage));
+ plugin->my_welcome.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME);
+ plugin->my_welcome.clientIdentity = *plugin->env->my_identity;
+
+ if ( (NULL != service) &&
+ (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+ "transport-tcp",
+ "TCP_STEALTH")) )
+ {
+#ifdef TCP_STEALTH
+ plugin->myoptions |= TCP_OPTIONS_TCP_STEALTH;
+ lsocks = GNUNET_SERVICE_get_listen_sockets (service);
+ if (NULL != lsocks)
+ {
+ uint32_t len = sizeof (struct WelcomeMessage);
+
+ for (i=0;NULL!=lsocks[i];i++)
+ {
+ if ( (GNUNET_OK !=
+ GNUNET_NETWORK_socket_setsockopt (lsocks[i],
+ IPPROTO_TCP,
+ TCP_STEALTH,
+ env->my_identity,
+ sizeof (struct GNUNET_PeerIdentity))) ||
+ (GNUNET_OK !=
+ GNUNET_NETWORK_socket_setsockopt (lsocks[i],
+ IPPROTO_TCP,
+ TCP_STEALTH_INTEGRITY_LEN,
+ &len,
+ sizeof (len))) )
+ {
+ /* TCP STEALTH not supported by kernel */
+ GNUNET_assert (0 == i);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("TCP_STEALTH not supported on this platform.\n"));
+ goto die;
+ }
+ }
+ }
+#else
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("TCP_STEALTH not supported on this platform.\n"));
+ goto die;
+#endif
+ }
+
+ if ( (NULL != service) &&
(GNUNET_SYSERR !=
(ret_s =
GNUNET_SERVICE_get_server_addresses ("transport-tcp",
(const struct sockaddr **) addrs, addrlens,
&tcp_nat_port_map_callback,
&try_connection_reversal,
- plugin);
+ plugin, NULL);
for (ret = ret_s -1; ret >= 0; ret--)
GNUNET_free (addrs[ret]);
GNUNET_free_non_null (addrs);
else
{
plugin->nat = GNUNET_NAT_register (plugin->env->cfg,
- GNUNET_YES, 0, 0, NULL, NULL, NULL,
- &try_connection_reversal, plugin);
+ GNUNET_YES,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ NULL,
+ &try_connection_reversal,
+ plugin,
+ NULL);
}
api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
api->cls = plugin;
api->send = &tcp_plugin_send;
api->get_session = &tcp_plugin_get_session;
- api->disconnect_session = &tcp_disconnect_session;
- api->query_keepalive_factor = &tcp_query_keepalive_factor;
+ api->disconnect_session = &tcp_plugin_disconnect_session;
+ api->query_keepalive_factor = &tcp_plugin_query_keepalive_factor;
api->disconnect_peer = &tcp_plugin_disconnect;
api->address_pretty_printer = &tcp_plugin_address_pretty_printer;
api->check_address = &tcp_plugin_check_address;
- api->address_to_string = &tcp_address_to_string;
- api->string_to_address = &tcp_string_to_address;
- api->get_network = &tcp_get_network;
+ api->address_to_string = &tcp_plugin_address_to_string;
+ api->string_to_address = &tcp_plugin_string_to_address;
+ api->get_network = &tcp_plugin_get_network;
api->update_session_timeout = &tcp_plugin_update_session_timeout;
api->update_inbound_delay = &tcp_plugin_update_inbound_delay;
api->setup_monitor = &tcp_plugin_setup_monitor;
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"transport-tcp",
"TIMEOUT");
- if (NULL != plugin->nat)
- GNUNET_NAT_unregister (plugin->nat);
- GNUNET_free(plugin);
- GNUNET_free(api);
- return NULL;
+ goto die;
}
plugin->server
- = GNUNET_SERVER_create_with_sockets (&plugin_tcp_access_check,
- plugin, NULL,
- idle_timeout, GNUNET_YES);
+ = GNUNET_SERVER_create_with_sockets (NULL,
+ plugin,
+ NULL,
+ idle_timeout,
+ GNUNET_YES);
}
plugin->handlers = GNUNET_malloc (sizeof (my_handlers));
memcpy (plugin->handlers, my_handlers, sizeof(my_handlers));
for (i = 0;i < sizeof(my_handlers) / sizeof(struct GNUNET_SERVER_MessageHandler);i++)
plugin->handlers[i].callback_cls = plugin;
- GNUNET_SERVER_add_handlers (plugin->server, plugin->handlers);
- GNUNET_SERVER_disconnect_notify (plugin->server, &disconnect_notify, plugin);
+ GNUNET_SERVER_add_handlers (plugin->server,
+ plugin->handlers);
+ GNUNET_SERVER_connect_notify (plugin->server,
+ &connect_notify,
+ plugin);
+ GNUNET_SERVER_disconnect_notify (plugin->server,
+ &disconnect_notify,
+ plugin);
plugin->nat_wait_conns = GNUNET_CONTAINER_multipeermap_create (16,
GNUNET_YES);
if (0 != bport)
_("TCP transport advertises itself as being on port %llu\n"),
aport);
/* Initially set connections to 0 */
- GNUNET_assert(NULL != plugin->env->stats);
GNUNET_STATISTICS_set (plugin->env->stats,
- gettext_noop ("# TCP sessions active"), 0, GNUNET_NO);
+ gettext_noop ("# TCP sessions active"),
+ 0,
+ GNUNET_NO);
return api;
+
+ die:
+ if (NULL != plugin->nat)
+ GNUNET_NAT_unregister (plugin->nat);
+ GNUNET_CONTAINER_multipeermap_destroy (plugin->sessionmap);
+ if (NULL != service)
+ GNUNET_SERVICE_stop (service);
+ GNUNET_free (plugin);
+ GNUNET_free_non_null (api);
+ return NULL;
}
&session_disconnect_it,
plugin);
- next = ppc_dll_head;
- for (cur = next; NULL != cur; cur = next)
+ for (cur = plugin->ppc_dll_head; NULL != cur; cur = next)
{
- GNUNET_break (0);
next = cur->next;
- GNUNET_CONTAINER_DLL_remove (ppc_dll_head,
- ppc_dll_tail,
+ GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head,
+ plugin->ppc_dll_tail,
cur);
GNUNET_RESOLVER_request_cancel (cur->resolver_handle);
+ cur->asc (cur->asc_cls,
+ NULL,
+ GNUNET_OK);
GNUNET_free (cur);
}
GNUNET_SERVICE_stop (plugin->service);
else
GNUNET_SERVER_destroy (plugin->server);
- GNUNET_free(plugin->handlers);
+ GNUNET_free (plugin->handlers);
if (NULL != plugin->nat)
GNUNET_NAT_unregister (plugin->nat);
while (NULL != (tcp_probe = plugin->probe_head))
plugin->probe_tail,
tcp_probe);
GNUNET_CONNECTION_destroy (tcp_probe->sock);
- GNUNET_free(tcp_probe);
+ GNUNET_free (tcp_probe);
}
GNUNET_CONTAINER_multipeermap_destroy (plugin->nat_wait_conns);
GNUNET_CONTAINER_multipeermap_destroy (plugin->sessionmap);
- GNUNET_free(plugin);
- GNUNET_free(api);
+ GNUNET_break (0 == plugin->cur_connections);
+ GNUNET_free (plugin);
+ GNUNET_free (api);
return NULL;
}
projects / oweals / gnunet.git / blobdiff