/*
This file is part of GNUnet.
- Copyright (C) 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
{
GNUNET_break (0);
LOG (GNUNET_ERROR_TYPE_WARNING,
- "Port %u by client %p was not registered.\n",
- key, value);
+ "Port %u by client %p was not registered.\n",
+ key, value);
}
return GNUNET_OK;
}
+/**
+ * Iterator for deleting each channel whose client endpoint disconnected.
+ *
+ * @param cls Closure (client that has disconnected).
+ * @param key The local channel id (used to access the hashmap).
+ * @param value The value stored at the key (channel to destroy).
+ *
+ * @return GNUNET_OK, keep iterating.
+ */
+static int
+channel_destroy_iterator (void *cls,
+ uint32_t key,
+ void *value)
+{
+ struct CadetChannel *ch = value;
+ struct CadetClient *c = cls;
-/******************************************************************************/
-/******************************** HANDLES ***********************************/
-/******************************************************************************/
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ " Channel %s destroy, due to client %s shutdown.\n",
+ GCCH_2s (ch), GML_2s (c));
+
+ GCCH_handle_local_destroy (ch, c, key < GNUNET_CADET_LOCAL_CHANNEL_ID_SERV);
+ return GNUNET_OK;
+}
/**
- * Handler for client connection.
+ * Unregister data and free memory for a client.
*
- * @param cls Closure (unused).
- * @param client Client handler.
+ * @param c Client to destroy. No longer valid after call.
*/
static void
-handle_client_connect (void *cls, struct GNUNET_SERVER_Client *client)
+client_destroy (struct CadetClient *c)
+{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " client destroy: %p/%u\n", c, c->id);
+ GNUNET_SERVER_client_drop (c->handle);
+ c->shutting_down = GNUNET_YES;
+
+ if (NULL != c->own_channels)
+ {
+ GNUNET_CONTAINER_multihashmap32_iterate (c->own_channels,
+ &channel_destroy_iterator, c);
+ GNUNET_CONTAINER_multihashmap32_destroy (c->own_channels);
+ }
+ if (NULL != c->incoming_channels)
+ {
+ GNUNET_CONTAINER_multihashmap32_iterate (c->incoming_channels,
+ &channel_destroy_iterator, c);
+ GNUNET_CONTAINER_multihashmap32_destroy (c->incoming_channels);
+ }
+ if (NULL != c->ports)
+ {
+ GNUNET_CONTAINER_multihashmap32_iterate (c->ports,
+ &client_release_ports, c);
+ GNUNET_CONTAINER_multihashmap32_destroy (c->ports);
+ }
+
+ GNUNET_CONTAINER_DLL_remove (clients_head, clients_tail, c);
+ GNUNET_STATISTICS_update (stats, "# clients", -1, GNUNET_NO);
+ GNUNET_SERVER_client_set_user_context (c->handle, NULL);
+ GNUNET_free (c);
+}
+
+/**
+ * Create a client record, register data and initialize memory.
+ *
+ * @param client Client's handle.
+ */
+static struct CadetClient *
+client_new (struct GNUNET_SERVER_Client *client)
{
struct CadetClient *c;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "client connected: %p\n", client);
- if (NULL == client)
- return;
+ GNUNET_SERVER_client_keep (client);
+ GNUNET_SERVER_notification_context_add (nc, client);
+
c = GNUNET_new (struct CadetClient);
c->handle = client;
c->id = next_client_id++; /* overflow not important: just for debug */
c->next_chid = GNUNET_CADET_LOCAL_CHANNEL_ID_SERV;
- GNUNET_SERVER_client_keep (client);
+
+ c->own_channels = GNUNET_CONTAINER_multihashmap32_create (32);
+ c->incoming_channels = GNUNET_CONTAINER_multihashmap32_create (32);
+
GNUNET_SERVER_client_set_user_context (client, c);
GNUNET_CONTAINER_DLL_insert (clients_head, clients_tail, c);
+ GNUNET_STATISTICS_update (stats, "# clients", +1, GNUNET_NO);
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " client created: %p/%u\n", c, c->id);
+
+ return c;
}
+/******************************************************************************/
+/******************************** HANDLES ***********************************/
+/******************************************************************************/
+
/**
- * Iterator for deleting each channel whose client endpoint disconnected.
- *
- * @param cls Closure (client that has disconnected).
- * @param key The local channel id (used to access the hashmap).
- * @param value The value stored at the key (channel to destroy).
+ * Handler for client connection.
*
- * @return GNUNET_OK, keep iterating.
+ * @param cls Closure (unused).
+ * @param client Client handler.
*/
-static int
-channel_destroy_iterator (void *cls,
- uint32_t key,
- void *value)
+static void
+handle_client_connect (void *cls, struct GNUNET_SERVER_Client *client)
{
- struct CadetChannel *ch = value;
- struct CadetClient *c = cls;
-
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- " Channel %s destroy, due to client %s shutdown.\n",
- GCCH_2s (ch), GML_2s (c));
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Client connected: %p\n", client);
+ if (NULL == client)
+ return;
- GCCH_handle_local_destroy (ch, c, key < GNUNET_CADET_LOCAL_CHANNEL_ID_SERV);
- return GNUNET_OK;
+ (void) client_new (client);
}
{
struct CadetClient *c;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "client disconnected: %p\n", client);
- if (client == NULL)
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG, " (SERVER DOWN)\n");
- return;
- }
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Client disconnected: %p\n", client);
c = GML_client_get (client);
if (NULL != c)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "matching client found (%u, %p)\n",
c->id, c);
- GNUNET_SERVER_client_drop (c->handle);
- c->shutting_down = GNUNET_YES;
- if (NULL != c->own_channels)
- {
- GNUNET_CONTAINER_multihashmap32_iterate (c->own_channels,
- &channel_destroy_iterator, c);
- GNUNET_CONTAINER_multihashmap32_destroy (c->own_channels);
- }
-
- if (NULL != c->incoming_channels)
- {
- GNUNET_CONTAINER_multihashmap32_iterate (c->incoming_channels,
- &channel_destroy_iterator, c);
- GNUNET_CONTAINER_multihashmap32_destroy (c->incoming_channels);
- }
-
- if (NULL != c->ports)
- {
- GNUNET_CONTAINER_multihashmap32_iterate (c->ports,
- &client_release_ports, c);
- GNUNET_CONTAINER_multihashmap32_destroy (c->ports);
- }
- GNUNET_CONTAINER_DLL_remove (clients_head, clients_tail, c);
- GNUNET_STATISTICS_update (stats, "# clients", -1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " client free (%p)\n", c);
- GNUNET_free (c);
+ client_destroy (c);
}
else
{
- LOG (GNUNET_ERROR_TYPE_WARNING, " context NULL!\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " disconnecting client's context NULL\n");
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, "done!\n");
return;
}
uint32_t *p;
unsigned int i;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "\n");
- LOG (GNUNET_ERROR_TYPE_DEBUG, "new client connected %p\n", client);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "new client registering %p\n", client);
/* Check data sanity */
- size = ntohs (message->size) - sizeof (struct GNUNET_CADET_ClientConnect);
- cc_msg = (struct GNUNET_CADET_ClientConnect *) message;
+ size = ntohs (message->size);
+ if (size < sizeof (struct GNUNET_CADET_ClientConnect))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ size -= sizeof (struct GNUNET_CADET_ClientConnect); /* Array size */
if (0 != (size % sizeof (uint32_t)))
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
- size /= sizeof (uint32_t);
+ size /= sizeof (uint32_t); /* Number of ports */
+ cc_msg = (struct GNUNET_CADET_ClientConnect *) message;
- /* Initialize new client structure */
+ /* Retrieve client structure */
c = GNUNET_SERVER_client_get_user_context (client, struct CadetClient);
if (NULL == c)
{
return;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG, " client id %u\n", c->id);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " client has %u ports\n", size);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, " client %u has %u ports\n", c-> id, size);
if (size > 0)
{
uint32_t u32;
}
}
- c->own_channels = GNUNET_CONTAINER_multihashmap32_create (32);
- c->incoming_channels = GNUNET_CONTAINER_multihashmap32_create (32);
- GNUNET_SERVER_notification_context_add (nc, client);
- GNUNET_STATISTICS_update (stats, "# clients", 1, GNUNET_NO);
-
GNUNET_SERVER_receive_done (client, GNUNET_OK);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "new client processed\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "new regitering processed\n");
}
/* Retrieve tunnel */
chid = ntohl (msg->channel_id);
- LOG (GNUNET_ERROR_TYPE_DEBUG, " for channel %X\n", chid);
ch = GML_channel_get (c, chid);
+
+ LOG (GNUNET_ERROR_TYPE_INFO, "Client %u is destroying channel %X\n",
+ c->id, chid);
+
if (NULL == ch)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG, " channel %X not found\n", chid);
+ LOG (GNUNET_ERROR_TYPE_WARNING, " channel %X not found\n", chid);
GNUNET_STATISTICS_update (stats,
"# client destroy messages on unknown channel",
1, GNUNET_NO);
GNUNET_SERVER_notification_context_unicast (nc, c->handle,
&resp->header, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_INFO, "Show peer request from client %u completed.\n");
+ LOG (GNUNET_ERROR_TYPE_INFO, "Show peer from client %u completed.\n", c->id);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
iter_channel (void *cls, struct CadetChannel *ch)
{
struct GNUNET_CADET_LocalInfoTunnel *msg = cls;
- struct GNUNET_HashCode *h = (struct GNUNET_HashCode *) &msg[1];
+ struct GNUNET_CADET_Hash *h = (struct GNUNET_CADET_Hash *) &msg[1];
CADET_ChannelNumber *chn = (CADET_ChannelNumber *) &h[msg->connections];
chn[msg->channels] = htonl (GCCH_get_id (ch));
}
msg = (struct GNUNET_CADET_LocalInfo *) message;
- LOG (GNUNET_ERROR_TYPE_INFO,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received tunnel info request from client %u for tunnel %s\n",
c->id, GNUNET_i2s_full(&msg->peer));
resp = GNUNET_malloc (size);
resp->header.type = htons (GNUNET_MESSAGE_TYPE_CADET_LOCAL_INFO_TUNNEL);
resp->header.size = htons (size);
+ resp->destination = msg->peer;
+ /* Do not interleave with iterators, iter_channel needs conn in HBO */
GCT_iterate_connections (t, &iter_connection, resp);
GCT_iterate_channels (t, &iter_channel, resp);
- /* Do not interleave with iterators, iter_channel needs conn in HBO */
- resp->destination = msg->peer;
resp->connections = htonl (resp->connections);
resp->channels = htonl (resp->channels);
+ /* Do not interleave end */
resp->cstate = htons (GCT_get_cstate (t));
resp->estate = htons (GCT_get_estate (t));
GNUNET_SERVER_notification_context_unicast (nc, c->handle,
&resp->header, GNUNET_NO);
GNUNET_free (resp);
- LOG (GNUNET_ERROR_TYPE_INFO,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Show tunnel request from client %u completed. %u conn, %u ch\n",
c->id, c_n, ch_n);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
LOG (GNUNET_ERROR_TYPE_INFO, "Received dump info request from client %u\n",
c->id);
-
LOG (GNUNET_ERROR_TYPE_ERROR,
"*************************** DUMP START ***************************\n");
+ for (c = clients_head; NULL != c; c = c->next)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR, "Client %u (%p), handle: %p\n",
+ c->id, c, c->handle);
+ if (NULL != c->ports)
+ LOG (GNUNET_ERROR_TYPE_ERROR, "\t%3u ports registered\n",
+ GNUNET_CONTAINER_multihashmap32_size (c->ports));
+ else
+ LOG (GNUNET_ERROR_TYPE_ERROR, "\t no ports registered\n");
+ LOG (GNUNET_ERROR_TYPE_ERROR, "\t%3u own channles\n",
+ GNUNET_CONTAINER_multihashmap32_size (c->own_channels));
+ LOG (GNUNET_ERROR_TYPE_ERROR, "\t%3u incoming channles\n",
+ GNUNET_CONTAINER_multihashmap32_size (c->incoming_channels));
+ }
+ LOG (GNUNET_ERROR_TYPE_ERROR, "***************************\n");
GCP_iterate_all (&show_peer_iterator, NULL);
LOG (GNUNET_ERROR_TYPE_ERROR,
void
GML_shutdown (void)
{
+ struct CadetClient *c;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down local\n");
+
+ for (c = clients_head; NULL != clients_head; c = clients_head)
+ client_destroy (c);
+
if (nc != NULL)
{
GNUNET_SERVER_notification_context_destroy (nc);
nc = NULL;
}
+
}
struct CadetClient *
GML_client_get (struct GNUNET_SERVER_Client *client)
{
+ if (NULL == client)
+ return NULL;
return GNUNET_SERVER_client_get_user_context (client, struct CadetClient);
}
projects / oweals / gnunet.git / blobdiff