/*
This file is part of GNUnet.
- (C) 2010,2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-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/gnunet-service-transport_clients.c
- * @brief plugin management API
+ * @brief communication with clients (core service and monitors)
* @author Christian Grothoff
*/
#include "platform.h"
#include "gnunet-service-transport_neighbours.h"
#include "gnunet-service-transport_plugins.h"
#include "gnunet-service-transport_validation.h"
+#include "gnunet-service-transport_manipulation.h"
#include "gnunet-service-transport.h"
#include "transport.h"
+
/**
* How many messages can we have pending for a given client process
* before we start to drop incoming messages? We typically should
/**
* Current transmit request handle.
*/
- struct GNUNET_CONNECTION_TransmitHandle *th;
+ struct GNUNET_SERVER_TransmitHandle *th;
/**
* Length of the list of messages pending for this client.
};
+/**
+ * Context for address to string operations
+ */
+struct AddressToStringContext
+{
+ /**
+ * This is a doubly-linked list.
+ */
+ struct AddressToStringContext *next;
+
+ /**
+ * This is a doubly-linked list.
+ */
+ struct AddressToStringContext *prev;
+
+ /**
+ * Transmission context
+ */
+ struct GNUNET_SERVER_TransmitContext* tc;
+};
+
+
+/**
+ * Client monitoring changes of active addresses or validations
+ * of our neighbours. Which type is being monitored depends on the
+ * DLL this struct is in.
+ */
+struct MonitoringClient
+{
+ /**
+ * This is a doubly-linked list.
+ */
+ struct MonitoringClient *next;
+
+ /**
+ * This is a doubly-linked list.
+ */
+ struct MonitoringClient *prev;
+
+ /**
+ * Handle to the client.
+ */
+ struct GNUNET_SERVER_Client *client;
+
+ /**
+ * Peer identity to monitor the addresses of.
+ * Zero to monitor all neighrours.
+ */
+ struct GNUNET_PeerIdentity peer;
+
+};
+
+
/**
* Head of linked list of all clients to this service.
*/
static struct TransportClient *clients_tail;
/**
- * Find the internal handle associated with the given client handle
+ * Head of linked list of all pending address iterations
+ */
+static struct AddressToStringContext *a2s_head;
+
+/**
+ * Tail of linked list of all pending address iterations
+ */
+static struct AddressToStringContext *a2s_tail;
+
+/**
+ * Head of linked list of monitoring clients.
+ */
+static struct MonitoringClient *peer_monitoring_clients_head;
+
+/**
+ * Tail of linked list of monitoring clients.
+ */
+static struct MonitoringClient *peer_monitoring_clients_tail;
+
+/**
+ * Head of linked list of validation monitoring clients.
+ */
+static struct MonitoringClient *val_monitoring_clients_head;
+
+/**
+ * Tail of linked list of validation monitoring clients.
+ */
+static struct MonitoringClient *val_monitoring_clients_tail;
+
+/**
+ * Notification context, to send updates on changes to active addresses
+ * of our neighbours.
+ */
+static struct GNUNET_SERVER_NotificationContext *peer_nc;
+
+/**
+ * Notification context, to send updates on changes to active addresses
+ * of our neighbours.
+ */
+static struct GNUNET_SERVER_NotificationContext *val_nc;
+
+/**
+ * Notification context, to send updates on changes to active plugin
+ * connections.
+ */
+static struct GNUNET_SERVER_NotificationContext *plugin_nc;
+
+/**
+ * Plugin monitoring client we are currently syncing, NULL if all
+ * monitoring clients are in sync.
+ */
+static struct GNUNET_SERVER_Client *sync_client;
+
+/**
+ * Peer identity that is all zeros, used as a way to indicate
+ * "all peers". Used for comparissons.
+ */
+static struct GNUNET_PeerIdentity all_zeros;
+
+
+/**
+ * Find the internal handle associated with the given client handle.
*
* @param client server's client handle to look up
* @return internal client handle
static struct TransportClient *
lookup_client (struct GNUNET_SERVER_Client *client)
{
- struct TransportClient *tc;
-
- tc = clients_head;
- while (tc != NULL)
- {
- if (tc->client == client)
- return tc;
- tc = tc->next;
- }
- return NULL;
+ return GNUNET_SERVER_client_get_user_context (client,
+ struct TransportClient);
}
/**
- * Create the internal handle for the given server client handle
+ * Create the internal handle for the given server client handle.
*
* @param client server's client handle to create our internal handle for
* @return fresh internal client handle
{
struct TransportClient *tc;
- GNUNET_assert (lookup_client (client) == NULL);
- tc = GNUNET_malloc (sizeof (struct TransportClient));
+ GNUNET_assert (NULL == lookup_client (client));
+ tc = GNUNET_new (struct TransportClient);
tc->client = client;
- GNUNET_CONTAINER_DLL_insert (clients_head, clients_tail, tc);
-
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %X connected\n", tc);
-#endif
+ GNUNET_SERVER_client_set_user_context (client, tc);
+ GNUNET_CONTAINER_DLL_insert (clients_head,
+ clients_tail,
+ tc);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p connected\n",
+ tc);
return tc;
}
+/**
+ * Find the handle to the monitoring client associated with the given
+ * client handle.
+ *
+ * @param head the head of the client queue to look in
+ * @param client server's client handle to look up
+ * @return handle to the monitoring client
+ */
+static struct MonitoringClient *
+lookup_monitoring_client (struct MonitoringClient *head,
+ struct GNUNET_SERVER_Client *client)
+{
+ struct MonitoringClient *mc;
+
+ for (mc = head; NULL != mc; mc = mc->next)
+ if (mc->client == client)
+ return mc;
+ return NULL;
+}
+
+
+/**
+ * Setup a new monitoring client using the given server client handle and
+ * the peer identity.
+ *
+ * @param client server's client handle to create our internal handle for
+ * @param peer identity of the peer to monitor the addresses of,
+ * zero to monitor all neighrours.
+ * @return handle to the new monitoring client
+ */
+static struct MonitoringClient *
+setup_peer_monitoring_client (struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ struct MonitoringClient *mc;
+
+ GNUNET_assert (NULL ==
+ lookup_monitoring_client (peer_monitoring_clients_head,
+ client));
+ mc = GNUNET_new (struct MonitoringClient);
+ mc->client = client;
+ mc->peer = *peer;
+ GNUNET_CONTAINER_DLL_insert (peer_monitoring_clients_head,
+ peer_monitoring_clients_tail,
+ mc);
+ GNUNET_SERVER_client_mark_monitor (client);
+ GNUNET_SERVER_notification_context_add (peer_nc,
+ client);
+ if (0 != memcmp (peer,
+ &all_zeros,
+ sizeof (struct GNUNET_PeerIdentity)))
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p started monitoring of the peer `%s'\n",
+ mc,
+ GNUNET_i2s (peer));
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p started monitoring all peers\n",
+ mc);
+ return mc;
+}
+
+
+/**
+ * Setup a new monitoring client using the given server client handle and
+ * the peer identity.
+ *
+ * @param client server's client handle to create our internal handle for
+ * @param peer identity of the peer to monitor the addresses of,
+ * zero to monitor all neighrours.
+ * @return handle to the new monitoring client
+ */
+static struct MonitoringClient *
+setup_val_monitoring_client (struct GNUNET_SERVER_Client *client,
+ struct GNUNET_PeerIdentity *peer)
+{
+ struct MonitoringClient *mc;
+
+ GNUNET_assert (NULL ==
+ lookup_monitoring_client (val_monitoring_clients_head,
+ client));
+ mc = GNUNET_new (struct MonitoringClient);
+ mc->client = client;
+ mc->peer = *peer;
+ GNUNET_CONTAINER_DLL_insert (val_monitoring_clients_head,
+ val_monitoring_clients_tail,
+ mc);
+ GNUNET_SERVER_notification_context_add (val_nc, client);
+
+ if (0 != memcmp (peer,
+ &all_zeros,
+ sizeof (struct GNUNET_PeerIdentity)))
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p started monitoring of the peer `%s'\n",
+ mc,
+ GNUNET_i2s (peer));
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p started monitoring all peers\n",
+ mc);
+ return mc;
+}
+
+
/**
* Function called to notify a client about the socket being ready to
- * queue more data. "buf" will be NULL and "size" zero if the socket
+ * queue more data. @a buf will be NULL and @a size zero if the socket
* was closed for writing in the meantime.
*
* @param cls closure
- * @param size number of bytes available in buf
+ * @param size number of bytes available in @a buf
* @param buf where the callee should write the message
- * @return number of bytes written to buf
+ * @return number of bytes written to @a buf
*/
static size_t
-transmit_to_client_callback (void *cls, size_t size, void *buf)
+transmit_to_client_callback (void *cls,
+ size_t size,
+ void *buf)
{
struct TransportClient *tc = cls;
struct ClientMessageQueueEntry *q;
size_t tsize;
tc->th = NULL;
- if (buf == NULL)
+ if (NULL == buf)
{
-#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmission to client failed, closing connection.\n");
-#endif
return 0;
}
cbuf = buf;
msize = ntohs (msg->size);
if (msize + tsize > size)
break;
-#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting message of type %u to client %X.\n",
- ntohs (msg->type), tc);
-#endif
- GNUNET_CONTAINER_DLL_remove (tc->message_queue_head, tc->message_queue_tail,
+ "Transmitting message of type %u to client %p.\n",
+ ntohs (msg->type),
+ tc);
+ GNUNET_CONTAINER_DLL_remove (tc->message_queue_head,
+ tc->message_queue_tail,
q);
tc->message_count--;
memcpy (&cbuf[tsize], msg, msize);
GNUNET_SERVER_notify_transmit_ready (tc->client, msize,
GNUNET_TIME_UNIT_FOREVER_REL,
&transmit_to_client_callback, tc);
- GNUNET_assert (tc->th != NULL);
+ GNUNET_assert (NULL != tc->th);
}
return tsize;
}
*
* @param tc target of the message
* @param msg message to transmit
- * @param may_drop GNUNET_YES if the message can be dropped
+ * @param may_drop #GNUNET_YES if the message can be dropped
*/
static void
-unicast (struct TransportClient *tc, const struct GNUNET_MessageHeader *msg,
+unicast (struct TransportClient *tc,
+ const struct GNUNET_MessageHeader *msg,
int may_drop)
{
struct ClientMessageQueueEntry *q;
uint16_t msize;
- if ((tc->message_count >= MAX_PENDING) && (GNUNET_YES == may_drop))
+ if (NULL == msg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _
- ("Dropping message of type %u and size %u, have %u/%u messages pending\n"),
- ntohs (msg->type), ntohs (msg->size), tc->message_count,
+ GNUNET_break (0);
+ return;
+ }
+ if ( (tc->message_count >= MAX_PENDING) &&
+ (GNUNET_YES == may_drop) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Dropping message of type %u and size %u, have %u/%u messages pending\n",
+ ntohs (msg->type),
+ ntohs (msg->size),
+ tc->message_count,
MAX_PENDING);
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
q = GNUNET_malloc (sizeof (struct ClientMessageQueueEntry) + msize);
memcpy (&q[1], msg, msize);
GNUNET_CONTAINER_DLL_insert_tail (tc->message_queue_head,
- tc->message_queue_tail, q);
+ tc->message_queue_tail,
+ q);
tc->message_count++;
- if (tc->th != NULL)
+ if (NULL != tc->th)
return;
tc->th =
GNUNET_SERVER_notify_transmit_ready (tc->client, msize,
GNUNET_TIME_UNIT_FOREVER_REL,
&transmit_to_client_callback, tc);
- GNUNET_assert (tc->th != NULL);
+ GNUNET_assert (NULL != tc->th);
}
* Called whenever a client is disconnected. Frees our
* resources associated with that client.
*
- * @param cls closure
+ * @param cls closure, NULL
* @param client identification of the client
*/
static void
-client_disconnect_notification (void *cls, struct GNUNET_SERVER_Client *client)
+client_disconnect_notification (void *cls,
+ struct GNUNET_SERVER_Client *client)
{
struct TransportClient *tc;
+ struct MonitoringClient *mc;
struct ClientMessageQueueEntry *mqe;
- if (client == NULL)
+ if (NULL == client)
return;
+ mc = lookup_monitoring_client (peer_monitoring_clients_head,
+ client);
+ if (NULL != mc)
+ {
+ GNUNET_CONTAINER_DLL_remove (peer_monitoring_clients_head,
+ peer_monitoring_clients_tail,
+ mc);
+ GNUNET_free (mc);
+ }
+ mc = lookup_monitoring_client (val_monitoring_clients_head,
+ client);
+ if (NULL != mc)
+ {
+ GNUNET_CONTAINER_DLL_remove (val_monitoring_clients_head,
+ val_monitoring_clients_tail,
+ mc);
+ GNUNET_free (mc);
+ }
tc = lookup_client (client);
- if (tc == NULL)
+ if (NULL == tc)
return;
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
- "Client %X disconnected, cleaning up.\n", tc);
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p disconnected, cleaning up.\n",
+ tc);
while (NULL != (mqe = tc->message_queue_head))
{
- GNUNET_CONTAINER_DLL_remove (tc->message_queue_head, tc->message_queue_tail,
+ GNUNET_CONTAINER_DLL_remove (tc->message_queue_head,
+ tc->message_queue_tail,
mqe);
tc->message_count--;
GNUNET_free (mqe);
}
- GNUNET_CONTAINER_DLL_remove (clients_head, clients_tail, tc);
- if (tc->th != NULL)
+ GNUNET_CONTAINER_DLL_remove (clients_head,
+ clients_tail,
+ tc);
+ GNUNET_SERVER_client_set_user_context (client, NULL);
+ if (NULL != tc->th)
{
- GNUNET_CONNECTION_notify_transmit_ready_cancel (tc->th);
+ GNUNET_SERVER_notify_transmit_ready_cancel (tc->th);
tc->th = NULL;
}
GNUNET_break (0 == tc->message_count);
* Function called for each of our connected neighbours. Notify the
* client about the existing neighbour.
*
- * @param cls the 'struct TransportClient' to notify
+ * @param cls the `struct TransportClient *` to notify
* @param peer identity of the neighbour
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
* @param address the address
+ * @param state the current state of the peer
+ * @param state_timeout the time out for the state
+ * @param bandwidth_in inbound bandwidth in NBO
+ * @param bandwidth_out outbound bandwidth in NBO
*/
static void
notify_client_about_neighbour (void *cls,
const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count,
- const struct GNUNET_HELLO_Address *address)
+ const struct GNUNET_HELLO_Address *address,
+ enum GNUNET_TRANSPORT_PeerState state,
+ struct GNUNET_TIME_Absolute state_timeout,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
{
struct TransportClient *tc = cls;
- struct ConnectInfoMessage *cim;
- struct GNUNET_ATS_Information *ap;
- size_t size =
- sizeof (struct ConnectInfoMessage) +
- ats_count * sizeof (struct GNUNET_ATS_Information);
- char buf[size];
-
- GNUNET_assert (size < GNUNET_SERVER_MAX_MESSAGE_SIZE);
- cim = (struct ConnectInfoMessage *) buf;
- cim->header.size = htons (size);
- cim->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT);
- cim->ats_count = htonl (ats_count);
- cim->id = *peer;
- ap = (struct GNUNET_ATS_Information *) &cim[1];
- memcpy (ap, ats, ats_count * sizeof (struct GNUNET_ATS_Information));
- unicast (tc, &cim->header, GNUNET_NO);
+ struct ConnectInfoMessage cim;
+
+ if (GNUNET_NO == GST_neighbours_test_connected (peer))
+ return;
+ cim.header.size = htons (sizeof (struct ConnectInfoMessage));
+ cim.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT);
+ cim.id = *peer;
+ cim.quota_in = bandwidth_in;
+ cim.quota_out = bandwidth_out;
+ unicast (tc, &cim.header, GNUNET_NO);
}
* @param message the start message that was sent
*/
static void
-clients_handle_start (void *cls, struct GNUNET_SERVER_Client *client,
+clients_handle_start (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
const struct StartMessage *start;
+ const struct GNUNET_MessageHeader *hello;
struct TransportClient *tc;
uint32_t options;
tc = lookup_client (client);
-
-#if DEBUG_TRANSPORT
- if (tc != NULL)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
- "Client %X sent START\n", tc);
- else
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
- "Client %X sent START\n", tc);
-#endif
- if (tc != NULL)
+ if (NULL != tc)
{
/* got 'start' twice from the same client, not allowed */
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
- "TransportClient %X ServerClient %X sent multiple START messages\n",
- tc, tc->client);
-#endif
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p sent START\n",
+ client);
start = (const struct StartMessage *) message;
options = ntohl (start->options);
if ((0 != (1 & options)) &&
(0 !=
- memcmp (&start->self, &GST_my_identity,
+ memcmp (&start->self,
+ &GST_my_identity,
sizeof (struct GNUNET_PeerIdentity))))
{
/* client thinks this is a different peer, reject */
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Rejecting control connection from peer `%s', which is not me!\n"),
- GNUNET_i2s (&start->self));
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
tc = setup_client (client);
tc->send_payload = (0 != (2 & options));
- unicast (tc, GST_hello_get (), GNUNET_NO);
- GST_neighbours_iterate (¬ify_client_about_neighbour, tc);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ hello = GST_hello_get ();
+ if (NULL != hello)
+ unicast (tc,
+ hello,
+ GNUNET_NO);
+ GST_neighbours_iterate (¬ify_client_about_neighbour,
+ tc);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
* @param message the HELLO message
*/
static void
-clients_handle_hello (void *cls, struct GNUNET_SERVER_Client *client,
+clients_handle_hello (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
GST_validation_handle_hello (message);
/**
- * Closure for 'handle_send_transmit_continuation'
+ * Closure for #handle_send_transmit_continuation()
*/
struct SendTransmitContinuationContext
{
* OK to send the next message.
*
* @param cls closure
- * @param success GNUNET_OK on success, GNUNET_NO on failure, GNUNET_SYSERR if we're not connected
+ * @param success #GNUNET_OK on success, #GNUNET_NO on failure, #GNUNET_SYSERR if we're not connected
+ * @param bytes_payload bytes payload sent
+ * @param bytes_on_wire bytes sent on wire
*/
static void
-handle_send_transmit_continuation (void *cls, int success)
+handle_send_transmit_continuation (void *cls,
+ int success,
+ size_t bytes_payload,
+ size_t bytes_on_wire)
{
struct SendTransmitContinuationContext *stcc = cls;
struct SendOkMessage send_ok_msg;
send_ok_msg.header.size = htons (sizeof (send_ok_msg));
send_ok_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK);
+ send_ok_msg.bytes_msg = htonl (bytes_payload);
+ send_ok_msg.bytes_physical = htonl (bytes_on_wire);
send_ok_msg.success = htonl (success);
- send_ok_msg.latency =
- GNUNET_TIME_relative_hton (GNUNET_TIME_UNIT_FOREVER_REL);
send_ok_msg.peer = stcc->target;
- GST_clients_unicast (stcc->client, &send_ok_msg.header, GNUNET_NO);
+ GST_clients_unicast (stcc->client,
+ &send_ok_msg.header,
+ GNUNET_NO);
GNUNET_SERVER_client_drop (stcc->client);
GNUNET_free (stcc);
}
* @param message the send message that was sent
*/
static void
-clients_handle_send (void *cls, struct GNUNET_SERVER_Client *client,
+clients_handle_send (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
const struct OutboundMessage *obm;
{
/* client asked for transmission before 'START' */
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
sizeof (struct OutboundMessage) + sizeof (struct GNUNET_MessageHeader))
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
obm = (const struct OutboundMessage *) message;
if (msize < sizeof (struct GNUNET_MessageHeader))
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
- GNUNET_STATISTICS_update (GST_stats,
- gettext_noop
- ("# bytes payload received for other peers"), msize,
- GNUNET_NO);
-#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' request from client with target `%4s' and first message of type %u and total size %u\n",
- "SEND", GNUNET_i2s (&obm->peer), ntohs (obmm->type), msize);
-#endif
+
if (GNUNET_NO == GST_neighbours_test_connected (&obm->peer))
{
/* not connected, not allowed to send; can happen due to asynchronous operations */
-#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Could not send message to peer `%s': not connected\n",
GNUNET_i2s (&obm->peer));
-#endif
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
("# bytes payload dropped (other peer was not connected)"),
msize, GNUNET_NO);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
return;
}
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- stcc = GNUNET_malloc (sizeof (struct SendTransmitContinuationContext));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received SEND request for `%s' and first message of type %u and total size %u\n",
+ GNUNET_i2s (&obm->peer),
+ ntohs (obmm->type),
+ msize);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
+ stcc = GNUNET_new (struct SendTransmitContinuationContext);
stcc->target = obm->peer;
stcc->client = client;
GNUNET_SERVER_client_keep (client);
- GST_neighbours_send (&obm->peer, obmm, msize,
- GNUNET_TIME_relative_ntoh (obm->timeout),
- &handle_send_transmit_continuation, stcc);
-}
-
-
-/**
- * Try to initiate a connection to the given peer if the blacklist
- * allowed it.
- *
- * @param cls closure (unused, NULL)
- * @param peer identity of peer that was tested
- * @param result GNUNET_OK if the connection is allowed,
- * GNUNET_NO if not
- */
-static void
-try_connect_if_allowed (void *cls, const struct GNUNET_PeerIdentity *peer,
- int result)
-{
- if (GNUNET_OK != result)
- return; /* not allowed */
- GST_neighbours_try_connect (peer);
+ GST_manipulation_send (&obm->peer,
+ obmm,
+ msize,
+ GNUNET_TIME_relative_ntoh (obm->timeout),
+ &handle_send_transmit_continuation,
+ stcc);
}
* @param message the actual message
*/
static void
-clients_handle_request_connect (void *cls, struct GNUNET_SERVER_Client *client,
+clients_handle_request_connect (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
- const struct TransportRequestConnectMessage *trcm =
- (const struct TransportRequestConnectMessage *) message;
+ const struct TransportRequestConnectMessage *trcm;
+ trcm = (const struct TransportRequestConnectMessage *) message;
+ GNUNET_break (0 == ntohl (trcm->reserved));
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
("# REQUEST CONNECT messages received"), 1,
GNUNET_NO);
-#if DEBUG_TRANSPORT
+ if (0 == memcmp (&trcm->peer,
+ &GST_my_identity,
+ sizeof (struct GNUNET_PeerIdentity)))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
+ return;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received a request connect message for peer `%s'\n",
GNUNET_i2s (&trcm->peer));
-#endif
- (void) GST_blacklist_test_allowed (&trcm->peer, NULL, &try_connect_if_allowed,
- NULL);
+ GST_neighbours_try_connect (&trcm->peer);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
/**
- * Take the given address and append it to the set of results sent back to
- * the client.
+ * Handle request disconnect message
*
- * @param cls the transmission context used ('struct GNUNET_SERVER_TransmitContext*')
- * @param address the resolved name, NULL to indicate the last response
+ * @param cls closure (always NULL)
+ * @param client identification of the client
+ * @param message the actual message
*/
static void
-transmit_address_to_client (void *cls, const char *buf)
+clients_handle_request_disconnect (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- struct GNUNET_SERVER_TransmitContext *tc = cls;
+ const struct TransportRequestDisconnectMessage *trdm;
- if (NULL == buf)
+ trdm = (const struct TransportRequestDisconnectMessage *) message;
+ GNUNET_break (0 == ntohl (trdm->reserved));
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# REQUEST DISCONNECT messages received"), 1,
+ GNUNET_NO);
+ if (0 == memcmp (&trdm->peer,
+ &GST_my_identity,
+ sizeof (struct GNUNET_PeerIdentity)))
{
- GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
- GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY);
- GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
return;
}
- GNUNET_SERVER_transmit_context_append_data (tc, buf, strlen (buf) + 1,
- GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received a request disconnect message for peer `%s'\n",
+ GNUNET_i2s (&trdm->peer));
+ (void) GST_neighbours_force_disconnect (&trdm->peer);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
/**
* Take the given address and append it to the set of results sent back to
- * the client.
+ * the client. This function may be called serveral times for a single
+ * conversion. The last invocation will be with a @a address of
+ * NULL and a @a res of #GNUNET_OK. Thus, to indicate conversion
+ * errors, the callback might be called first with @a address NULL and
+ * @a res being #GNUNET_SYSERR. In that case, there will still be a
+ * subsequent call later with @a address NULL and @a res #GNUNET_OK.
*
- * @param cls the transmission context used ('struct GNUNET_SERVER_TransmitContext*')
- * @param address the resolved name, NULL to indicate the last response
+ * @param cls the transmission context used (`struct GNUNET_SERVER_TransmitContext *`)
+ * @param buf text to transmit (contains the human-readable address, or NULL)
+ * @param res #GNUNET_OK if conversion was successful, #GNUNET_SYSERR on error,
+ * never #GNUNET_NO
*/
static void
-transmit_binary_to_client (void *cls, void *buf, size_t size)
+transmit_address_to_client (void *cls,
+ const char *buf,
+ int res)
{
- struct GNUNET_SERVER_TransmitContext *tc = cls;
+ struct AddressToStringContext *actx = cls;
+ struct AddressToStringResultMessage *atsm;
+ size_t len;
+ size_t slen;
+ GNUNET_assert ( (GNUNET_OK == res) ||
+ (GNUNET_SYSERR == res) );
if (NULL == buf)
{
- GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
- GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY);
- GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
- return;
+ len = sizeof (struct AddressToStringResultMessage);
+ atsm = GNUNET_malloc (len);
+ atsm->header.size = ntohs (len);
+ atsm->header.type = ntohs (GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY);
+ if (GNUNET_OK == res)
+ {
+ /* this was the last call, transmit */
+ atsm->res = htonl (GNUNET_OK);
+ atsm->addr_len = htonl (0);
+ GNUNET_SERVER_transmit_context_append_message (actx->tc,
+ (const struct GNUNET_MessageHeader *) atsm);
+ GNUNET_SERVER_transmit_context_run (actx->tc,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+ GNUNET_CONTAINER_DLL_remove (a2s_head,
+ a2s_tail,
+ actx);
+ GNUNET_free (atsm);
+ GNUNET_free (actx);
+ return;
+ }
+ if (GNUNET_SYSERR == res)
+ {
+ /* address conversion failed, but there will be more callbacks */
+ atsm->res = htonl (GNUNET_SYSERR);
+ atsm->addr_len = htonl (0);
+ GNUNET_SERVER_transmit_context_append_message (actx->tc,
+ (const struct GNUNET_MessageHeader *) atsm);
+ GNUNET_free (atsm);
+ return;
+ }
}
- GNUNET_SERVER_transmit_context_append_data (tc, buf, size,
- GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY);
+ GNUNET_assert (GNUNET_OK == res);
+ /* succesful conversion, append*/
+ slen = strlen (buf) + 1;
+ len = sizeof (struct AddressToStringResultMessage) + slen;
+ atsm = GNUNET_malloc (len);
+ atsm->header.size = ntohs (len);
+ atsm->header.type = ntohs (GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY);
+ atsm->res = htonl (GNUNET_YES);
+ atsm->addr_len = htonl (slen);
+ memcpy (&atsm[1],
+ buf,
+ slen);
+ GNUNET_SERVER_transmit_context_append_message (actx->tc,
+ (const struct GNUNET_MessageHeader *) atsm);
+ GNUNET_free (atsm);
}
* @param message the resolution request
*/
static void
-clients_handle_address_lookup (void *cls, struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+clients_handle_address_to_string (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
const struct AddressLookupMessage *alum;
struct GNUNET_TRANSPORT_PluginFunctions *papi;
uint32_t address_len;
uint16_t size;
struct GNUNET_SERVER_TransmitContext *tc;
+ struct AddressToStringContext *actx;
+ struct AddressToStringResultMessage atsm;
struct GNUNET_TIME_Relative rtimeout;
int32_t numeric;
return;
}
alum = (const struct AddressLookupMessage *) message;
- address_len = ntohl (alum->addrlen);
+ address_len = ntohs (alum->addrlen);
if (size <= sizeof (struct AddressLookupMessage) + address_len)
{
GNUNET_break (0);
}
address = (const char *) &alum[1];
plugin_name = (const char *) &address[address_len];
- if (plugin_name[size - sizeof (struct AddressLookupMessage) - address_len - 1]
- != '\0')
+ if ('\0' != plugin_name[size - sizeof (struct AddressLookupMessage) - address_len - 1])
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
rtimeout = GNUNET_TIME_relative_ntoh (alum->timeout);
- numeric = ntohl (alum->numeric_only);
+ numeric = ntohs (alum->numeric_only);
tc = GNUNET_SERVER_transmit_context_create (client);
- papi = GST_plugins_find (plugin_name);
+ papi = GST_plugins_printer_find (plugin_name);
if (NULL == papi)
{
- GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
- GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY);
- GNUNET_SERVER_transmit_context_run (tc, rtimeout);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to find plugin `%s'\n",
+ plugin_name);
+ atsm.header.size = ntohs (sizeof (struct AddressToStringResultMessage));
+ atsm.header.type = ntohs (GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY);
+ atsm.res = htonl (GNUNET_SYSERR);
+ atsm.addr_len = htonl (0);
+ GNUNET_SERVER_transmit_context_append_message (tc,
+ &atsm.header);
+ atsm.header.size = ntohs (sizeof (struct AddressToStringResultMessage));
+ atsm.header.type = ntohs (GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING_REPLY);
+ atsm.res = htonl (GNUNET_OK);
+ atsm.addr_len = htonl (0);
+ GNUNET_SERVER_transmit_context_append_message (tc,
+ &atsm.header);
+ GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
return;
}
+ actx = GNUNET_new (struct AddressToStringContext);
+ actx->tc = tc;
+ GNUNET_CONTAINER_DLL_insert (a2s_head, a2s_tail, actx);
GNUNET_SERVER_disable_receive_done_warning (client);
- papi->address_pretty_printer (papi->cls, plugin_name, address, address_len,
- numeric, rtimeout, &transmit_address_to_client,
- tc);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Pretty-printing address of %u bytes using plugin `%s'\n",
+ address_len,
+ plugin_name);
+ papi->address_pretty_printer (papi->cls,
+ plugin_name,
+ address, address_len,
+ numeric,
+ rtimeout,
+ &transmit_address_to_client,
+ actx);
}
/**
- * Send an address to the client.
+ * Compose #PeerIterateResponseMessage using the given peer and address.
*
- * @param cls our 'struct GNUNET_SERVER_TransmitContext' (for sending)
- * @param public_key public key for the peer, never NULL
- * @param valid_until until what time do we consider the address valid?
- * @param validation_block is FOREVER if the address is for an unsupported plugin (from PEERINFO)
- * is ZERO if the address is considered valid (no validation needed)
- * is a time in the future if we're currently denying re-validation
- * @param address address to transmit
+ * @param peer identity of the peer
+ * @param address the address, NULL on disconnect
+ * @return composed message
+ */
+static struct PeerIterateResponseMessage *
+compose_address_iterate_response_message (const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address)
+{
+ struct PeerIterateResponseMessage *msg;
+ size_t size;
+ size_t tlen;
+ size_t alen;
+ char *addr;
+
+ GNUNET_assert (NULL != peer);
+ if (NULL != address)
+ {
+ tlen = strlen (address->transport_name) + 1;
+ alen = address->address_length;
+ }
+ else
+ {
+ tlen = 0;
+ alen = 0;
+ }
+ size = (sizeof (struct PeerIterateResponseMessage) + alen + tlen);
+ msg = GNUNET_malloc (size);
+ msg->header.size = htons (size);
+ msg->header.type =
+ htons (GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_RESPONSE);
+ msg->reserved = htonl (0);
+ msg->peer = *peer;
+ msg->addrlen = htonl (alen);
+ msg->pluginlen = htonl (tlen);
+
+ if (NULL != address)
+ {
+ msg->local_address_info = htonl((uint32_t) address->local_info);
+ addr = (char *) &msg[1];
+ memcpy (addr, address->address, alen);
+ memcpy (&addr[alen], address->transport_name, tlen);
+ }
+ return msg;
+}
+
+
+/**
+ * Compose #PeerIterateResponseMessage using the given peer and address.
+ *
+ * @param peer identity of the peer
+ * @param address the address, NULL on disconnect
+ * @return composed message
+ */
+static struct ValidationIterateResponseMessage *
+compose_validation_iterate_response_message (const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address)
+{
+ struct ValidationIterateResponseMessage *msg;
+ size_t size;
+ size_t tlen;
+ size_t alen;
+ char *addr;
+
+ GNUNET_assert (NULL != peer);
+ if (NULL != address)
+ {
+ tlen = strlen (address->transport_name) + 1;
+ alen = address->address_length;
+ }
+ else
+ {
+ tlen = 0;
+ alen = 0;
+ }
+ size = (sizeof (struct ValidationIterateResponseMessage) + alen + tlen);
+ msg = GNUNET_malloc (size);
+ msg->header.size = htons (size);
+ msg->header.type =
+ htons (GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_VALIDATION_RESPONSE);
+ msg->reserved = htonl (0);
+ msg->peer = *peer;
+ msg->addrlen = htonl (alen);
+ msg->pluginlen = htonl (tlen);
+
+ if (NULL != address)
+ {
+ msg->local_address_info = htonl((uint32_t) address->local_info);
+ addr = (char *) &msg[1];
+ memcpy (addr, address->address, alen);
+ memcpy (&addr[alen], address->transport_name, tlen);
+ }
+ return msg;
+}
+
+
+/**
+ * Context for #send_validation_information() and
+ * #send_peer_information().
+ */
+struct IterationContext
+{
+ /**
+ * Context to use for the transmission.
+ */
+ struct GNUNET_SERVER_TransmitContext *tc;
+
+ /**
+ * Which peers do we care about?
+ */
+ struct GNUNET_PeerIdentity id;
+
+ /**
+ * #GNUNET_YES if @e id should be ignored because we want all peers.
+ */
+ int all;
+};
+
+
+/**
+ * Output information of validation entries to the given client.
+ *
+ * @param cls the `struct IterationContext *`
+ * @param address the address
+ * @param last_validation point in time when last validation was performed
+ * @param valid_until point in time how long address is valid
+ * @param next_validation point in time when next validation will be performed
+ * @param state state of validation notification
+ */
+static void
+send_validation_information (void *cls,
+ const struct GNUNET_HELLO_Address *address,
+ struct GNUNET_TIME_Absolute last_validation,
+ struct GNUNET_TIME_Absolute valid_until,
+ struct GNUNET_TIME_Absolute next_validation,
+ enum GNUNET_TRANSPORT_ValidationState state)
+{
+ struct IterationContext *pc = cls;
+ struct ValidationIterateResponseMessage *msg;
+
+ if ( (GNUNET_YES != pc->all) &&
+ (0 != memcmp (&address->peer, &pc->id, sizeof (pc->id))) )
+ return;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending information about for validation entry for peer `%s' using address `%s'\n",
+ GNUNET_i2s (&address->peer),
+ (NULL != address) ? GST_plugins_a2s (address) : "<none>");
+ msg = compose_validation_iterate_response_message (&address->peer, address);
+ msg->last_validation = GNUNET_TIME_absolute_hton(last_validation);
+ msg->valid_until = GNUNET_TIME_absolute_hton(valid_until);
+ msg->next_validation = GNUNET_TIME_absolute_hton(next_validation);
+ msg->state = htonl ((uint32_t) state);
+ GNUNET_SERVER_transmit_context_append_message (pc->tc, &msg->header);
+ GNUNET_free (msg);
+}
+
+
+/**
+ * Output information of neighbours to the given client.
+ *
+ * @param cls the `struct PeerIterationContext *`
+ * @param peer identity of the neighbour
+ * @param address the address
+ * @param state current state this peer is in
+ * @param state_timeout timeout for the current state of the peer
+ * @param bandwidth_in inbound quota in NBO
+ * @param bandwidth_out outbound quota in NBO
*/
static void
-send_address_to_client (void *cls,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
- *public_key,
- struct GNUNET_TIME_Absolute valid_until,
- struct GNUNET_TIME_Absolute validation_block,
- const struct GNUNET_HELLO_Address *address)
-{
- struct GNUNET_SERVER_TransmitContext *tc = cls;
- char *addr_buf;
-
- /* FIXME: move to a binary format!!! */
- GNUNET_asprintf (&addr_buf, "%s --- %s, %s",
- GST_plugins_a2s (address),
- (GNUNET_YES ==
- GST_neighbours_test_connected (&address->peer)) ? "CONNECTED" :
- "DISCONNECTED",
- (GNUNET_TIME_absolute_get_remaining (valid_until).rel_value >
- 0) ? "VALIDATED" : "UNVALIDATED");
- transmit_address_to_client (tc, addr_buf);
- GNUNET_free (addr_buf);
+send_peer_information (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
+ enum GNUNET_TRANSPORT_PeerState state,
+ struct GNUNET_TIME_Absolute state_timeout,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
+{
+ struct IterationContext *pc = cls;
+ struct PeerIterateResponseMessage *msg;
+
+ if ( (GNUNET_YES != pc->all) &&
+ (0 != memcmp (peer, &pc->id, sizeof (pc->id))) )
+ return;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending information about `%s' using address `%s' in state `%s'\n",
+ GNUNET_i2s(peer),
+ (NULL != address) ? GST_plugins_a2s (address) : "<none>",
+ GNUNET_TRANSPORT_ps2s (state));
+ msg = compose_address_iterate_response_message (peer, address);
+ msg->state = htonl (state);
+ msg->state_timeout = GNUNET_TIME_absolute_hton(state_timeout);
+ GNUNET_SERVER_transmit_context_append_message (pc->tc, &msg->header);
+ GNUNET_free (msg);
}
/**
- * Client asked to obtain information about a peer's addresses.
+ * Client asked to obtain information about a specific or all peers
* Process the request.
- * FIXME: use better name!
*
* @param cls unused
* @param client the client
* @param message the peer address information request
*/
static void
-clients_handle_peer_address_lookup (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+clients_handle_monitor_peers (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- const struct PeerAddressLookupMessage *peer_address_lookup;
struct GNUNET_SERVER_TransmitContext *tc;
+ const struct PeerMonitorMessage *msg;
+ struct IterationContext pc;
- peer_address_lookup = (const struct PeerAddressLookupMessage *) message;
- GNUNET_break (ntohl (peer_address_lookup->reserved) == 0);
- tc = GNUNET_SERVER_transmit_context_create (client);
- GST_validation_get_addresses (&peer_address_lookup->peer,
- &send_address_to_client, tc);
- GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
- GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY);
+ msg = (const struct PeerMonitorMessage *) message;
+ if ( (GNUNET_YES != ntohl (msg->one_shot)) &&
+ (NULL != lookup_monitoring_client (peer_monitoring_clients_head,
+ client)) )
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
+ return;
+ }
+ GNUNET_SERVER_disable_receive_done_warning (client);
+ GNUNET_SERVER_client_mark_monitor (client);
+ pc.tc = tc = GNUNET_SERVER_transmit_context_create (client);
+
+ /* Send initial list */
+ if (0 == memcmp (&msg->peer,
+ &all_zeros,
+ sizeof (struct GNUNET_PeerIdentity)))
+ {
+ /* iterate over all neighbours */
+ pc.all = GNUNET_YES;
+ pc.id = msg->peer;
+ }
+ else
+ {
+ /* just return one neighbour */
+ pc.all = GNUNET_NO;
+ pc.id = msg->peer;
+ }
+ GST_neighbours_iterate (&send_peer_information,
+ &pc);
+
+ if (GNUNET_YES != ntohl (msg->one_shot))
+ {
+ setup_peer_monitoring_client (client,
+ &msg->peer);
+ }
+ else
+ {
+ GNUNET_SERVER_transmit_context_append_data (tc,
+ NULL,
+ 0,
+ GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_RESPONSE);
+ }
+ GNUNET_SERVER_transmit_context_run (tc,
+ GNUNET_TIME_UNIT_FOREVER_REL);
+}
+
+
+/**
+ * Client asked to obtain information about a specific or all validation
+ * processes
+ *
+ * @param cls unused
+ * @param client the client
+ * @param message the peer address information request
+ */
+static void
+clients_handle_monitor_validation (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct GNUNET_SERVER_TransmitContext *tc;
+ struct PeerMonitorMessage *msg;
+ struct IterationContext pc;
+
+ if (ntohs (message->type) != GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_VALIDATION_REQUEST)
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ if (ntohs (message->size) != sizeof (struct ValidationMonitorMessage))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ msg = (struct PeerMonitorMessage *) message;
+ if ( (GNUNET_YES != ntohl (msg->one_shot)) &&
+ (NULL != lookup_monitoring_client (val_monitoring_clients_head, client)) )
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ GNUNET_SERVER_disable_receive_done_warning (client);
+ GNUNET_SERVER_client_mark_monitor (client);
+ pc.tc = tc = GNUNET_SERVER_transmit_context_create (client);
+
+ /* Send initial list */
+ if (0 == memcmp (&msg->peer,
+ &all_zeros,
+ sizeof (struct GNUNET_PeerIdentity)))
+ {
+ /* iterate over all neighbours */
+ pc.all = GNUNET_YES;
+ pc.id = msg->peer;
+ }
+ else
+ {
+ /* just return one neighbour */
+ pc.all = GNUNET_NO;
+ pc.id = msg->peer;
+ }
+ GST_validation_iterate (&send_validation_information,
+ &pc);
+
+ if (GNUNET_YES != ntohl (msg->one_shot))
+ {
+ setup_val_monitoring_client (client, &msg->peer);
+ }
+ else
+ {
+ GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
+ GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_VALIDATION_RESPONSE);
+ }
GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
}
/**
- * Output the active address of connected neighbours to the given client.
+ * Function called by the plugin with information about the
+ * current sessions managed by the plugin (for monitoring).
*
- * @param cls the 'struct GNUNET_SERVER_TransmitContext' for transmission to the client
- * @param neighbour identity of the neighbour
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
- * @param address the address
+ * @param cls closure
+ * @param session session handle this information is about,
+ * NULL to indicate that we are "in sync" (initial
+ * iteration complete)
+ * @param info information about the state of the session,
+ * NULL if @a session is also NULL and we are
+ * merely signalling that the initial iteration is over
*/
static void
-output_addresses (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count,
- const struct GNUNET_HELLO_Address *address)
+plugin_session_info_cb (void *cls,
+ struct Session *session,
+ const struct GNUNET_TRANSPORT_SessionInfo *info)
{
- struct GNUNET_SERVER_TransmitContext *tc = cls;
- struct AddressIterateResponseMessage *msg;
+ struct TransportPluginMonitorMessage *msg;
+ struct GNUNET_MessageHeader sync;
size_t size;
size_t slen;
+ uint16_t alen;
+ char *name;
+ char *addr;
- slen = strlen (address->transport_name) + 1;
- size = (sizeof (struct AddressIterateResponseMessage) + slen);
+ if (0 == GNUNET_SERVER_notification_context_get_size (plugin_nc))
+ {
+ GST_plugins_monitor_subscribe (NULL,
+ NULL);
+ return;
+ }
+ if ( (NULL == info) &&
+ (NULL == session) )
+ {
+ /* end of initial iteration */
+ if (NULL != sync_client)
+ {
+ sync.size = htons (sizeof (struct GNUNET_MessageHeader));
+ sync.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PLUGIN_SYNC);
+ GNUNET_SERVER_notification_context_unicast (plugin_nc,
+ sync_client,
+ &sync,
+ GNUNET_NO);
+ sync_client = NULL;
+ }
+ return;
+ }
+ GNUNET_assert (NULL != info);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Plugin event for peer %s on transport %s\n",
+ GNUNET_i2s (&info->address->peer),
+ info->address->transport_name);
+ slen = strlen (info->address->transport_name) + 1;
+ alen = info->address->address_length;
+ size = sizeof (struct TransportPluginMonitorMessage) + slen + alen;
+ if (size > UINT16_MAX)
+ {
+ GNUNET_break (0);
+ return;
+ }
msg = GNUNET_malloc (size);
- memcpy (&msg->peer, peer, sizeof (struct GNUNET_PeerIdentity));
- memcpy (&msg[0], address->transport_name, slen);
- msg->addrlen = ntohs (address->address_length);
- msg->pluginlen = ntohs (slen);
- // FIXME: what about 'address->address'!?
- transmit_binary_to_client (tc, msg, size);
+ msg->header.size = htons (size);
+ msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PLUGIN_EVENT);
+ msg->session_state = htons ((uint16_t) info->state);
+ msg->is_inbound = htons ((int16_t) info->is_inbound);
+ msg->msgs_pending = htonl (info->num_msg_pending);
+ msg->bytes_pending = htonl (info->num_bytes_pending);
+ msg->timeout = GNUNET_TIME_absolute_hton (info->session_timeout);
+ msg->delay = GNUNET_TIME_absolute_hton (info->receive_delay);
+ msg->peer = info->address->peer;
+ msg->session_id = (uint64_t) (intptr_t) session;
+ msg->plugin_name_len = htons (slen);
+ msg->plugin_address_len = htons (alen);
+ name = (char *) &msg[1];
+ memcpy (name,
+ info->address->transport_name,
+ slen);
+ addr = &name[slen];
+ memcpy (addr,
+ info->address->address,
+ alen);
+ if (NULL != sync_client)
+ GNUNET_SERVER_notification_context_unicast (plugin_nc,
+ sync_client,
+ &msg->header,
+ GNUNET_NO);
+ else
+ GNUNET_SERVER_notification_context_broadcast (plugin_nc,
+ &msg->header,
+ GNUNET_NO);
GNUNET_free (msg);
}
/**
- * Client asked to obtain information about all actively used addresses.
- * Process the request. FIXME: use better name!
+ * Client asked to obtain information about all plugin connections.
*
* @param cls unused
* @param client the client
* @param message the peer address information request
*/
static void
-clients_handle_address_iterate (void *cls, struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
+clients_handle_monitor_plugins (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
{
- struct GNUNET_SERVER_TransmitContext *tc;
-
+ GNUNET_SERVER_client_mark_monitor (client);
GNUNET_SERVER_disable_receive_done_warning (client);
- tc = GNUNET_SERVER_transmit_context_create (client);
- GST_neighbours_iterate (&output_addresses, tc);
- GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
- GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY);
- GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
+ GNUNET_SERVER_notification_context_add (plugin_nc,
+ client);
+ GNUNET_assert (NULL == sync_client);
+ sync_client = client;
+ GST_plugins_monitor_subscribe (&plugin_session_info_cb,
+ NULL);
}
{&clients_handle_request_connect, NULL,
GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_CONNECT,
sizeof (struct TransportRequestConnectMessage)},
- {&clients_handle_address_lookup, NULL,
- GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_LOOKUP, 0},
- {&clients_handle_peer_address_lookup, NULL,
- GNUNET_MESSAGE_TYPE_TRANSPORT_PEER_ADDRESS_LOOKUP,
- sizeof (struct PeerAddressLookupMessage)},
- {&clients_handle_address_iterate, NULL,
- GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE,
- sizeof (struct AddressIterateMessage)},
+ {&clients_handle_request_disconnect, NULL,
+ GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_DISCONNECT,
+ sizeof (struct TransportRequestDisconnectMessage)},
+ {&clients_handle_address_to_string, NULL,
+ GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING, 0},
+ {&clients_handle_monitor_peers, NULL,
+ GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_REQUEST,
+ sizeof (struct PeerMonitorMessage)},
+ {&clients_handle_monitor_validation, NULL,
+ GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_VALIDATION_REQUEST,
+ sizeof (struct ValidationMonitorMessage)},
{&GST_blacklist_handle_init, NULL,
GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_INIT,
sizeof (struct GNUNET_MessageHeader)},
{&GST_blacklist_handle_reply, NULL,
GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_REPLY,
sizeof (struct BlacklistMessage)},
+ {&GST_manipulation_set_metric, NULL,
+ GNUNET_MESSAGE_TYPE_TRANSPORT_TRAFFIC_METRIC,
+ sizeof (struct TrafficMetricMessage) },
+ {&clients_handle_monitor_plugins, NULL,
+ GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PLUGIN_START,
+ sizeof (struct GNUNET_MessageHeader) },
{NULL, NULL, 0, 0}
};
+ peer_nc = GNUNET_SERVER_notification_context_create (server, 0);
+ val_nc = GNUNET_SERVER_notification_context_create (server, 0);
+ plugin_nc = GNUNET_SERVER_notification_context_create (server, 0);
GNUNET_SERVER_add_handlers (server, handlers);
- GNUNET_SERVER_disconnect_notify (server, &client_disconnect_notification,
+ GNUNET_SERVER_disconnect_notify (server,
+ &client_disconnect_notification,
NULL);
}
void
GST_clients_stop ()
{
- /* nothing to do */
+ struct AddressToStringContext *cur;
+
+ while (NULL != (cur = a2s_head))
+ {
+ GNUNET_SERVER_transmit_context_destroy (cur->tc, GNUNET_NO);
+ GNUNET_CONTAINER_DLL_remove (a2s_head, a2s_tail, cur);
+ GNUNET_free (cur);
+ }
+ if (NULL != peer_nc)
+ {
+ GNUNET_SERVER_notification_context_destroy (peer_nc);
+ peer_nc = NULL;
+ }
+ if (NULL != val_nc)
+ {
+ GNUNET_SERVER_notification_context_destroy (val_nc);
+ val_nc = NULL;
+ }
+ if (NULL != plugin_nc)
+ {
+ GNUNET_SERVER_notification_context_destroy (plugin_nc);
+ plugin_nc = NULL;
+ }
}
* Broadcast the given message to all of our clients.
*
* @param msg message to broadcast
- * @param may_drop GNUNET_YES if the message can be dropped / is payload
+ * @param may_drop #GNUNET_YES if the message can be dropped / is payload
*/
void
-GST_clients_broadcast (const struct GNUNET_MessageHeader *msg, int may_drop)
+GST_clients_broadcast (const struct GNUNET_MessageHeader *msg,
+ int may_drop)
{
struct TransportClient *tc;
- for (tc = clients_head; tc != NULL; tc = tc->next)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Asked to broadcast message of type %u with %u bytes\n",
+ (unsigned int) ntohs (msg->type),
+ (unsigned int) ntohs (msg->size));
+ for (tc = clients_head; NULL != tc; tc = tc->next)
{
- if ((GNUNET_YES == may_drop) && (GNUNET_YES != tc->send_payload))
- continue; /* skip, this client does not care about payload */
+ if ( (GNUNET_YES == may_drop) &&
+ (GNUNET_YES != tc->send_payload) )
+ continue; /* skip, this client does not care about payload */
unicast (tc, msg, may_drop);
}
}
*
* @param client target of the message
* @param msg message to transmit
- * @param may_drop GNUNET_YES if the message can be dropped
+ * @param may_drop #GNUNET_YES if the message can be dropped
*/
void
GST_clients_unicast (struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *msg, int may_drop)
+ const struct GNUNET_MessageHeader *msg,
+ int may_drop)
{
struct TransportClient *tc;
}
+/**
+ * Broadcast the new active address to all clients monitoring the peer.
+ *
+ * @param peer peer this update is about (never NULL)
+ * @param address address, NULL on disconnect
+ * @param state the current state of the peer
+ * @param state_timeout the time out for the state
+ */
+void
+GST_clients_broadcast_peer_notification (const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
+ enum GNUNET_TRANSPORT_PeerState state,
+ struct GNUNET_TIME_Absolute state_timeout)
+{
+ struct PeerIterateResponseMessage *msg;
+ struct MonitoringClient *mc;
+
+ msg = compose_address_iterate_response_message (peer, address);
+ msg->state = htonl (state);
+ msg->state_timeout = GNUNET_TIME_absolute_hton (state_timeout);
+ for (mc = peer_monitoring_clients_head; NULL != mc; mc = mc->next)
+ if ((0 == memcmp (&mc->peer, &all_zeros,
+ sizeof (struct GNUNET_PeerIdentity))) ||
+ (0 == memcmp (&mc->peer, peer,
+ sizeof (struct GNUNET_PeerIdentity))))
+ GNUNET_SERVER_notification_context_unicast (peer_nc,
+ mc->client,
+ &msg->header,
+ GNUNET_NO);
+ GNUNET_free (msg);
+}
+
+
+/**
+ * Broadcast the new validation changes to all clients monitoring the peer.
+ *
+ * @param peer peer this update is about (never NULL)
+ * @param address address, NULL on disconnect
+ * @param last_validation point in time when last validation was performed
+ * @param valid_until point in time how long address is valid
+ * @param next_validation point in time when next validation will be performed
+ * @param state state of validation notification
+ */
+void
+GST_clients_broadcast_validation_notification (const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
+ struct GNUNET_TIME_Absolute last_validation,
+ struct GNUNET_TIME_Absolute valid_until,
+ struct GNUNET_TIME_Absolute next_validation,
+ enum GNUNET_TRANSPORT_ValidationState state)
+{
+ struct ValidationIterateResponseMessage *msg;
+ struct MonitoringClient *mc;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending information about for validation entry for peer `%s' using address `%s'\n",
+ GNUNET_i2s(peer),
+ (address != NULL) ? GST_plugins_a2s (address) : "<none>");
+ msg = compose_validation_iterate_response_message (peer, address);
+ msg->last_validation = GNUNET_TIME_absolute_hton(last_validation);
+ msg->valid_until = GNUNET_TIME_absolute_hton(valid_until);
+ msg->next_validation = GNUNET_TIME_absolute_hton(next_validation);
+ msg->state = htonl ((uint32_t) state);
+ for (mc = val_monitoring_clients_head; NULL != mc; mc = mc->next)
+ if ((0 == memcmp (&mc->peer, &all_zeros,
+ sizeof (struct GNUNET_PeerIdentity))) ||
+ (0 == memcmp (&mc->peer, peer,
+ sizeof (struct GNUNET_PeerIdentity))))
+ GNUNET_SERVER_notification_context_unicast (val_nc,
+ mc->client,
+ &msg->header,
+ GNUNET_NO);
+ GNUNET_free (msg);
+}
+
+
/* end of file gnunet-service-transport_clients.c */
projects / oweals / gnunet.git / blobdiff