/*
This file is part of GNUnet
- (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Christian Grothoff (and other contributing authors)
+ (C) 2002--2012 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
*/
struct Session
{
+ /**
+ * To whom are we talking to (set to our identity
+ * if we are still waiting for the welcome message)
+ */
+ struct GNUNET_PeerIdentity target;
/**
* API requirement.
struct GNUNET_SERVER_TransmitHandle *transmit_handle;
/**
- * To whom are we talking to (set to our identity
- * if we are still waiting for the welcome message)
+ * ID of task used to delay receiving more to throttle sender.
*/
- struct GNUNET_PeerIdentity target;
+ GNUNET_SCHEDULER_TaskIdentifier receive_delay_task;
/**
- * ID of task used to delay receiving more to throttle sender.
+ * Session timeout task
*/
- GNUNET_SCHEDULER_TaskIdentifier receive_delay_task;
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
/**
* Address of the other peer (either based on our 'connect'
*/
struct GNUNET_NAT_Handle *nat;
- struct GNUNET_CONTAINER_MultiHashMap * sessionmap;
+ /**
+ * Map from peer identities to sessions for the given peer.
+ */
+ struct GNUNET_CONTAINER_MultiHashMap *sessionmap;
/**
* Handle to the network service.
*/
unsigned long long max_connections;
+ /**
+ * How many more TCP sessions do we have right now?
+ */
+ unsigned long long cur_connections;
+
/**
* ID of task used to update our addresses when one expires.
*/
};
+
+/**
+ * Start session timeout
+ */
+static void
+start_session_timeout (struct Session *s);
+
+
+/**
+ * Increment session timeout due to activity
+ */
+static void
+reschedule_session_timeout (struct Session *s);
+
+
+/**
+ * Cancel timeout
+ */
+static void
+stop_session_timeout (struct Session *s);
+
+
/* DEBUG CODE */
static const char *
tcp_address_to_string (void *cls, const void *addr, size_t addrlen);
+
static unsigned int sessions;
-static void inc_sessions (struct Plugin *plugin, struct Session *session, int line)
+
+static void
+inc_sessions (struct Plugin *plugin, struct Session *session, int line)
{
- sessions ++;
+ sessions++;
unsigned int size = GNUNET_CONTAINER_multihashmap_size(plugin->sessionmap);
if (sessions != size)
LOG (GNUNET_ERROR_TYPE_DEBUG, "Inconsistent sessions %u <-> session map size: %u\n",
tcp_address_to_string (NULL, session->addr, session->addrlen));
}
-static void dec_sessions (struct Plugin *plugin, struct Session *session, int line)
+
+static void
+dec_sessions (struct Plugin *plugin, struct Session *session, int line)
{
GNUNET_assert (sessions > 0);
unsigned int size = GNUNET_CONTAINER_multihashmap_size(plugin->sessionmap);
- sessions --;
+ sessions--;
if (sessions != size)
LOG (GNUNET_ERROR_TYPE_DEBUG, "Inconsistent sessions %u <-> session map size: %u\n",
sessions, size);
const struct sockaddr *addr, socklen_t addrlen)
{
struct Plugin *plugin = cls;
-
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Accepting new incoming TCP connection\n");
- if (0 == plugin->max_connections)
+ "Accepting new incoming TCP connection from `%s'\n",
+ GNUNET_a2s (addr, addrlen));
+ if (plugin->cur_connections >= plugin->max_connections)
return GNUNET_NO;
- plugin->max_connections--;
+ plugin->cur_connections ++;
return GNUNET_YES;
}
return;
}
/* modify our published address list */
- plugin->env->notify_address (plugin->env->cls, add_remove, arg, args);
+ plugin->env->notify_address (plugin->env->cls, add_remove, arg, args, "tcp");
}
int af;
uint16_t port;
- if (addrlen == sizeof (struct IPv6TcpAddress))
+ switch (addrlen)
{
+ case sizeof (struct IPv6TcpAddress):
t6 = addr;
af = AF_INET6;
port = ntohs (t6->t6_port);
memcpy (&a6, &t6->ipv6_addr, sizeof (a6));
sb = &a6;
- }
- else if (addrlen == sizeof (struct IPv4TcpAddress))
- {
+ break;
+ case sizeof (struct IPv4TcpAddress):
t4 = addr;
af = AF_INET;
port = ntohs (t4->t4_port);
memcpy (&a4, &t4->ipv4_addr, sizeof (a4));
sb = &a4;
- }
- else
- {
+ break;
+ default:
LOG (GNUNET_ERROR_TYPE_ERROR,
_("Unexpected address length: %u bytes\n"),
(unsigned int) addrlen);
GNUNET_break (0);
return GNUNET_SYSERR;
}
-
if ('\0' != addr[addrlen - 1])
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
-
if (strlen (addr) != addrlen - 1)
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
-
- int ret = GNUNET_STRINGS_to_address_ip (addr, strlen (addr),
- &socket_address);
-
- if (ret != GNUNET_OK)
+ if (GNUNET_OK !=
+ GNUNET_STRINGS_to_address_ip (addr, strlen (addr),
+ &socket_address))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
-
- if (socket_address.ss_family == AF_INET)
- {
- struct IPv4TcpAddress *t4;
- struct sockaddr_in *in4 = (struct sockaddr_in *) &socket_address;
- t4 = GNUNET_malloc (sizeof (struct IPv4TcpAddress));
- t4->ipv4_addr = in4->sin_addr.s_addr;
- t4->t4_port = in4->sin_port;
- *buf = t4;
- *added = sizeof (struct IPv4TcpAddress);
- return GNUNET_OK;
- }
- else if (socket_address.ss_family == AF_INET6)
+ switch (socket_address.ss_family)
{
- struct IPv6TcpAddress *t6;
- struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) &socket_address;
- t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress));
- t6->ipv6_addr = in6->sin6_addr;
- t6->t6_port = in6->sin6_port;
- *buf = t6;
- *added = sizeof (struct IPv6TcpAddress);
- return GNUNET_OK;
+ case AF_INET:
+ {
+ struct IPv4TcpAddress *t4;
+ struct sockaddr_in *in4 = (struct sockaddr_in *) &socket_address;
+
+ t4 = GNUNET_malloc (sizeof (struct IPv4TcpAddress));
+ t4->ipv4_addr = in4->sin_addr.s_addr;
+ t4->t4_port = in4->sin_port;
+ *buf = t4;
+ *added = sizeof (struct IPv4TcpAddress);
+ return GNUNET_OK;
+ }
+ case AF_INET6:
+ {
+ struct IPv6TcpAddress *t6;
+ struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) &socket_address;
+ t6 = GNUNET_malloc (sizeof (struct IPv6TcpAddress));
+ t6->ipv6_addr = in6->sin6_addr;
+ t6->t6_port = in6->sin6_port;
+ *buf = t6;
+ *added = sizeof (struct IPv6TcpAddress);
+ return GNUNET_OK;
+ }
+ default:
+ return GNUNET_SYSERR;
}
- return GNUNET_SYSERR;
}
static int
session_lookup_by_client_it (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+ const struct GNUNET_HashCode * key,
+ void *value)
{
struct SessionClientCtx *sc_ctx = cls;
struct Session *s = value;
*/
static struct Session *
lookup_session_by_client (struct Plugin *plugin,
- const struct GNUNET_SERVER_Client *client)
+ const struct GNUNET_SERVER_Client *client)
{
struct SessionClientCtx sc_ctx;
*
* @param plugin the plugin
* @param target peer to connect to
- * @param client client to use
+ * @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
* the session
create_session (struct Plugin *plugin, const struct GNUNET_PeerIdentity *target,
struct GNUNET_SERVER_Client *client, int is_nat)
{
- struct Session *ret;
+ struct Session *session;
struct PendingMessage *pm;
struct WelcomeMessage welcome;
- if (is_nat != GNUNET_YES)
- GNUNET_assert (client != NULL);
+ if (GNUNET_YES != is_nat)
+ GNUNET_assert (NULL != client);
else
- GNUNET_assert (client == NULL);
+ GNUNET_assert (NULL == client);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Creating new session for peer `%4s'\n",
GNUNET_i2s (target));
- ret = GNUNET_malloc (sizeof (struct Session));
- ret->last_activity = GNUNET_TIME_absolute_get ();
- ret->plugin = plugin;
- ret->is_nat = is_nat;
- ret->client = client;
- ret->target = *target;
- ret->expecting_welcome = GNUNET_YES;
- ret->ats_address_network_type = htonl (GNUNET_ATS_NET_UNSPECIFIED);
+ session = GNUNET_malloc (sizeof (struct Session));
+ session->last_activity = GNUNET_TIME_absolute_get ();
+ session->plugin = plugin;
+ session->is_nat = is_nat;
+ session->client = client;
+ session->target = *target;
+ session->expecting_welcome = GNUNET_YES;
+ session->ats_address_network_type = htonl (GNUNET_ATS_NET_UNSPECIFIED);
pm = GNUNET_malloc (sizeof (struct PendingMessage) +
sizeof (struct WelcomeMessage));
pm->msg = (const char *) &pm[1];
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes currently in TCP buffers"),
pm->message_size, GNUNET_NO);
- GNUNET_CONTAINER_DLL_insert (ret->pending_messages_head,
- ret->pending_messages_tail, pm);
- if (is_nat != GNUNET_YES)
+ GNUNET_CONTAINER_DLL_insert (session->pending_messages_head,
+ session->pending_messages_tail, pm);
+ if (GNUNET_YES != is_nat)
{
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# TCP sessions active"), 1,
GNUNET_NO);
}
- return ret;
+ start_session_timeout (session);
+
+ return session;
}
char *cbuf;
size_t ret;
- GNUNET_assert (session != NULL);
+ GNUNET_assert (NULL != session);
session->transmit_handle = NULL;
plugin = session->plugin;
- if (buf == NULL)
+ if (NULL == buf)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Timeout trying to transmit to peer `%4s', discarding message queue.\n",
{
GNUNET_CONTAINER_DLL_remove (hd, tl, pos);
if (pos->transmit_cont != NULL)
- pos->transmit_cont (pos->transmit_cont_cls, &pid, GNUNET_SYSERR);
+ pos->transmit_cont (pos->transmit_cont_cls, &pid, GNUNET_SYSERR, pos->message_size, 0);
GNUNET_free (pos);
}
GNUNET_STATISTICS_update (plugin->env->stats,
{
GNUNET_CONTAINER_DLL_remove (hd, tl, pos);
if (pos->transmit_cont != NULL)
- pos->transmit_cont (pos->transmit_cont_cls, &pid, GNUNET_OK);
+ pos->transmit_cont (pos->transmit_cont_cls, &pid, GNUNET_OK, pos->message_size, pos->message_size); /* FIXME: include TCP overhead */
GNUNET_free (pos);
}
GNUNET_assert (hd == NULL);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Disconnecting session of peer `%s' address `%s'\n",
GNUNET_i2s (&session->target),
- tcp_address_to_string(NULL, session->addr, session->addrlen));
+ tcp_address_to_string (NULL, session->addr, session->addrlen));
+
+ stop_session_timeout (session);
- if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(plugin->sessionmap, &session->target.hashPubKey, session))
- {
- GNUNET_STATISTICS_update (session->plugin->env->stats,
- gettext_noop ("# TCP sessions active"), -1,
- GNUNET_NO);
- dec_sessions (plugin, session, __LINE__);
- }
- else GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(plugin->nat_wait_conns, &session->target.hashPubKey, session));
+ if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (plugin->sessionmap, &session->target.hashPubKey, session))
+ {
+ GNUNET_STATISTICS_update (session->plugin->env->stats,
+ gettext_noop ("# TCP sessions active"), -1,
+ GNUNET_NO);
+ dec_sessions (plugin, session, __LINE__);
+ }
+ else GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (plugin->nat_wait_conns, &session->target.hashPubKey, session));
/* clean up state */
if (session->transmit_handle != NULL)
session->plugin->env->session_end (session->plugin->env->cls,
&session->target, session);
- if (session->nat_connection_timeout != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK != session->nat_connection_timeout)
{
GNUNET_SCHEDULER_cancel (session->nat_connection_timeout);
session->nat_connection_timeout = GNUNET_SCHEDULER_NO_TASK;
session->pending_messages_tail, pm);
if (NULL != pm->transmit_cont)
pm->transmit_cont (pm->transmit_cont_cls, &session->target,
- GNUNET_SYSERR);
+ GNUNET_SYSERR, pm->message_size, 0);
GNUNET_free (pm);
}
if (session->receive_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (session->receive_delay_task);
- if (session->client != NULL)
+ if (NULL != session->client)
GNUNET_SERVER_receive_done (session->client, GNUNET_SYSERR);
}
- if (session->client != NULL)
+ if (NULL != session->client)
{
+ GNUNET_SERVER_client_disconnect (session->client);
GNUNET_SERVER_client_drop (session->client);
session->client = NULL;
}
-
-
GNUNET_free_non_null (session->addr);
GNUNET_assert (NULL == session->transmit_handle);
GNUNET_free (session);
}
+struct FindSessionContext
+{
+ struct Session *s;
+ int res;
+};
+
+int session_it (void *cls,
+ const struct GNUNET_HashCode * key,
+ void *value)
+{
+ struct FindSessionContext *res = cls;
+ if (res->s == value)
+ {
+ res->res = GNUNET_OK;
+ return GNUNET_NO;
+ }
+ else
+ return GNUNET_YES;
+}
+
+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_multihashmap_iterate (plugin->sessionmap, &session_it, &session_map_res);
+
+ nat_map_res.s = session;
+ nat_map_res.res = GNUNET_SYSERR;
+ GNUNET_CONTAINER_multihashmap_iterate (plugin->nat_wait_conns, &session_it, &nat_map_res);
+
+ if ((session_map_res.res == GNUNET_SYSERR) && (nat_map_res.res == GNUNET_SYSERR))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
/**
* Function that can be used by the transport service to transmit
* a message using the plugin. Note that in the case of a
struct Plugin * plugin = cls;
struct PendingMessage *pm;
- GNUNET_assert (plugin != NULL);
- GNUNET_assert (session != NULL);
+ GNUNET_assert (NULL != plugin);
+ GNUNET_assert (NULL != session);
+
+ if (GNUNET_SYSERR == find_session(plugin, session))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Trying to send with invalid session %p\n"));
+ return GNUNET_SYSERR;
+ }
/* create new message entry */
pm = GNUNET_malloc (sizeof (struct PendingMessage) + msgbuf_size);
"Asked to transmit %u bytes to `%s', added message to list.\n",
msgbuf_size, GNUNET_i2s (&session->target));
- if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains_value(plugin->sessionmap, &session->target.hashPubKey, session))
+ if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains_value (plugin->sessionmap,
+ &session->target.hashPubKey,
+ session))
{
GNUNET_assert (session->client != NULL);
-
+ reschedule_session_timeout (session);
GNUNET_SERVER_client_set_timeout (session->client,
GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
GNUNET_STATISTICS_update (plugin->env->stats,
LOG (GNUNET_ERROR_TYPE_DEBUG,
"This NAT WAIT session for peer `%s' is not yet ready!\n",
GNUNET_i2s (&session->target));
-
+ reschedule_session_timeout (session);
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# bytes currently in TCP buffers"),
msgbuf_size, GNUNET_NO);
}
else
{
- if (cont != NULL)
- cont (cont_cls, &session->target, GNUNET_SYSERR);
+ 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 */
}
}
+
struct SessionItCtx
{
- void * addr;
+ void *addr;
size_t addrlen;
- struct Session * result;
+ struct Session *result;
};
+
static int
session_lookup_it (void *cls,
- const GNUNET_HashCode * key,
+ const struct GNUNET_HashCode *key,
void *value)
{
struct SessionItCtx * si_ctx = cls;
{
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->addr, session->addrlen));
*/
static struct Session *
tcp_plugin_get_session (void *cls,
- const struct GNUNET_HELLO_Address *address)
+ const struct GNUNET_HELLO_Address *address)
{
- struct Plugin * plugin = cls;
- struct Session * session = NULL;
+ struct Plugin *plugin = cls;
+ struct Session *session = NULL;
int af;
const void *sb;
size_t sbs;
/* look for existing session */
if (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_contains(plugin->sessionmap, &address->peer.hashPubKey))
+ GNUNET_CONTAINER_multihashmap_contains (plugin->sessionmap,
+ &address->peer.hashPubKey))
{
struct SessionItCtx si_ctx;
si_ctx.result = NULL;
- GNUNET_CONTAINER_multihashmap_get_multiple(plugin->sessionmap, &address->peer.hashPubKey, &session_lookup_it, &si_ctx);
+ GNUNET_CONTAINER_multihashmap_get_multiple (plugin->sessionmap,
+ &address->peer.hashPubKey,
+ &session_lookup_it, &si_ctx);
if (si_ctx.result != NULL)
{
session = si_ctx.result;
return NULL;
}
- if (0 == plugin->max_connections)
+ if (plugin->cur_connections >= plugin->max_connections)
{
/* saturated */
return NULL;
session->addrlen = 0;
session->addr = NULL;
session->ats_address_network_type = ats.value;
- session->nat_connection_timeout = GNUNET_SCHEDULER_add_delayed(NAT_TIMEOUT,
- &nat_connect_timeout,
- session);
+ session->nat_connection_timeout = GNUNET_SCHEDULER_add_delayed (NAT_TIMEOUT,
+ &nat_connect_timeout,
+ session);
GNUNET_assert (session != NULL);
- GNUNET_assert (GNUNET_CONTAINER_multihashmap_put
- (plugin->nat_wait_conns, &address->peer.hashPubKey, session,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY) == GNUNET_OK);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (plugin->nat_wait_conns,
+ &session->target.hashPubKey,
+ session,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Created NAT WAIT connection to `%4s' at `%s'\n",
}
/* create new outbound session */
- GNUNET_assert (0 != plugin->max_connections);
+ GNUNET_assert (plugin->cur_connections <= plugin->max_connections);
sa = GNUNET_CONNECTION_create_from_sockaddr (af, sb, sbs);
if (sa == NULL)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Failed to create connection to `%4s' at `%s'\n",
- GNUNET_i2s (&session->target), GNUNET_a2s (sb, sbs));
+ GNUNET_i2s (&address->peer), GNUNET_a2s (sb, sbs));
return NULL;
}
- plugin->max_connections--;
+ 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",
session->addrlen = addrlen;
session->ats_address_network_type = ats.value;
- GNUNET_CONTAINER_multihashmap_put(plugin->sessionmap, &address->peer.hashPubKey, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ GNUNET_CONTAINER_multihashmap_put (plugin->sessionmap,
+ &session->target.hashPubKey,
+ session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
inc_sessions (plugin, session, __LINE__);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ 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),
static int
session_disconnect_it (void *cls,
- const GNUNET_HashCode * key,
+ const struct GNUNET_HashCode * key,
void *value)
{
struct Session *session = value;
return GNUNET_YES;
}
+
/**
* Function that can be called to force a disconnect from the
* specified neighbour. This should also cancel all previously
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
session->nat_connection_timeout = GNUNET_SCHEDULER_NO_TASK;
}
- GNUNET_assert (GNUNET_CONTAINER_multihashmap_remove
- (plugin->nat_wait_conns,
- &tcp_nat_probe->clientIdentity.hashPubKey,
- session) == GNUNET_YES);
if (GNUNET_OK != GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
{
GNUNET_break (0);
- GNUNET_free (session);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ disconnect_session (session);
return;
}
-
- GNUNET_SERVER_client_keep (client);
- session->client = client;
+ GNUNET_assert (GNUNET_CONTAINER_multihashmap_remove
+ (plugin->nat_wait_conns,
+ &tcp_nat_probe->clientIdentity.hashPubKey,
+ session) == GNUNET_YES);
+ GNUNET_CONTAINER_multihashmap_put (plugin->sessionmap,
+ &session->target.hashPubKey, session,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
session->last_activity = GNUNET_TIME_absolute_get ();
session->inbound = GNUNET_NO;
LOG (GNUNET_ERROR_TYPE_DEBUG,
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Bad address for incoming connection!\n");
GNUNET_free (vaddr);
-
- GNUNET_SERVER_client_drop (client);
- GNUNET_free (session);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ disconnect_session (session);
return;
}
GNUNET_free (vaddr);
-
- GNUNET_CONTAINER_multihashmap_put(plugin->sessionmap, &session->target.hashPubKey, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ GNUNET_break (NULL == session->client);
+ GNUNET_SERVER_client_keep (client);
+ session->client = client;
inc_sessions (plugin, session, __LINE__);
GNUNET_STATISTICS_update (plugin->env->stats,
gettext_noop ("# TCP sessions active"), 1,
else
{
GNUNET_SERVER_client_keep (client);
+ if (plugin->service != NULL) /* 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 */
+
session = create_session (plugin, &wm->clientIdentity, client, GNUNET_NO);
session->inbound = GNUNET_YES;
if (GNUNET_OK == GNUNET_SERVER_client_get_address (client, &vaddr, &alen))
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Did not obtain TCP socket address for incoming connection\n");
}
- GNUNET_CONTAINER_multihashmap_put(plugin->sessionmap, &wm->clientIdentity.hashPubKey, session, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ GNUNET_CONTAINER_multihashmap_put (plugin->sessionmap,
+ &session->target.hashPubKey,
+ session,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
inc_sessions (plugin, session, __LINE__);
}
session->plugin->env->receive (session->plugin->env->cls,
&session->target, NULL, &ats, 0, session,
NULL, 0);
+ reschedule_session_timeout (session);
+
if (delay.rel_value == 0)
GNUNET_SERVER_receive_done (session->client, GNUNET_OK);
else
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));
+ "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);
distance[1].value = session->ats_address_network_type;
GNUNET_break (ntohl(session->ats_address_network_type) != GNUNET_ATS_NET_UNSPECIFIED);
+ GNUNET_assert (GNUNET_CONTAINER_multihashmap_contains_value (plugin->sessionmap,
+ &session->target.hashPubKey,
+ session));
+
delay = plugin->env->receive (plugin->env->cls,
&session->target,
message,
(const struct GNUNET_ATS_Information *) &distance,
- 1, session,
+ 2, session,
(GNUNET_YES == session->inbound) ? NULL : session->addr,
(GNUNET_YES == session->inbound) ? 0 : session->addrlen);
+
+ reschedule_session_timeout (session);
+
if (delay.rel_value == 0)
{
GNUNET_SERVER_receive_done (client, GNUNET_OK);
if (client == NULL)
return;
- plugin->max_connections++;
session = lookup_session_by_client (plugin, client);
if (session == NULL)
return; /* unknown, nothing to do */
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Destroying session of `%4s' with %s due to network-level disconnect.\n",
GNUNET_i2s (&session->target),
(session->addr !=
session->addr,
session->addrlen) :
"*");
+
+ if (plugin->cur_connections == plugin->max_connections)
+ 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"), 1,
}
+/**
+ * Session was idle, so disconnect it
+ */
+static void
+session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_assert (NULL != cls);
+ struct Session *s = cls;
+
+ s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Session %p was idle for %llu ms, disconnecting\n",
+ s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+ /* call session destroy function */
+ disconnect_session(s);
+}
+
+
+/**
+ * Start session timeout
+ */
+static void
+start_session_timeout (struct Session *s)
+{
+ GNUNET_assert (NULL != s);
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
+ s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ &session_timeout,
+ s);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout for session %p set to %llu ms\n",
+ s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+}
+
+
+/**
+ * Increment session timeout due to activity
+ */
+static void
+reschedule_session_timeout (struct Session *s)
+{
+ GNUNET_assert (NULL != s);
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
+
+ GNUNET_SCHEDULER_cancel (s->timeout_task);
+ s->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ &session_timeout,
+ s);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout rescheduled for session %p set to %llu ms\n",
+ s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+}
+
+
+/**
+ * Cancel timeout
+ */
+static void
+stop_session_timeout (struct Session *s)
+{
+ GNUNET_assert (NULL != s);
+
+ if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (s->timeout_task);
+ s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Timeout stopped for session %p canceled\n",
+ s, (unsigned long long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+ }
+}
+
+
/**
* Entry point for the plugin.
*
return api;
}
+ GNUNET_assert (NULL != env->cfg);
+ GNUNET_assert (NULL != env->stats);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-tcp",
"MAX_CONNECTIONS",
service = NULL;
plugin = GNUNET_malloc (sizeof (struct Plugin));
- plugin->sessionmap = GNUNET_CONTAINER_multihashmap_create(max_connections);
+ plugin->sessionmap = GNUNET_CONTAINER_multihashmap_create (max_connections, GNUNET_YES);
plugin->max_connections = max_connections;
+ plugin->cur_connections = 0;
plugin->open_port = bport;
plugin->adv_port = aport;
plugin->env = env;
}
else
{
- plugin->nat =
- GNUNET_NAT_register (env->cfg, GNUNET_YES, 0, 0, NULL, NULL, NULL,
+ plugin->nat = GNUNET_NAT_register (plugin->env->cfg,
+ GNUNET_YES, 0, 0, NULL, NULL, NULL,
&try_connection_reversal, plugin);
}
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
GNUNET_CONFIGURATION_get_value_time (env->cfg, "transport-tcp",
"TIMEOUT", &idle_timeout))
{
- LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to find option %s in section %s!\n"),
- "TIMEOUT", "transport-tcp");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "transport-tcp", "TIMEOUT");
if (plugin->nat != NULL)
GNUNET_NAT_unregister (plugin->nat);
GNUNET_free (plugin);
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);
- plugin->nat_wait_conns = GNUNET_CONTAINER_multihashmap_create (16);
+ plugin->nat_wait_conns = GNUNET_CONTAINER_multihashmap_create (16, GNUNET_YES);
if (bport != 0)
LOG (GNUNET_ERROR_TYPE_INFO,
_("TCP transport listening on port %llu\n"), bport);
projects / oweals / gnunet.git / blobdiff