};
+/**
+ * Client monitoring changes of active addresses of our neighbours.
+ */
+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;
+/**
+ * Head of linked list of monitoring clients.
+ */
+static struct MonitoringClient *monitoring_clients_head;
+
+/**
+ * Tail of linked list of monitoring clients.
+ */
+static struct MonitoringClient *monitoring_clients_tail;
+
+/**
+ * Notification context, to send updates on changes to active addresses
+ * of our neighbours.
+ */
+struct GNUNET_SERVER_NotificationContext *nc = NULL;
+
+
/**
* Find the internal handle associated with the given client handle
*
GNUNET_assert (lookup_client (client) == NULL);
tc = GNUNET_malloc (sizeof (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);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p connected\n", tc);
#endif
return tc;
}
+/**
+ * Find the handle to the monitoring client associated with the given
+ * client handle
+ *
+ * @param client server's client handle to look up
+ * @return handle to the monitoring client
+ */
+static struct MonitoringClient *
+lookup_monitoring_client (struct GNUNET_SERVER_Client *client)
+{
+ struct MonitoringClient *mc;
+
+ mc = monitoring_clients_head;
+ while (mc != NULL)
+ {
+ if (mc->client == client)
+ return mc;
+ mc = mc->next;
+ }
+ 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_monitoring_client (struct GNUNET_SERVER_Client *client,
+ struct GNUNET_PeerIdentity *peer)
+{
+ struct MonitoringClient *mc;
+
+ GNUNET_assert (lookup_monitoring_client (client) == NULL);
+ mc = GNUNET_malloc (sizeof (struct MonitoringClient));
+ mc->client = client;
+ mc->peer = *peer;
+ GNUNET_CONTAINER_DLL_insert (monitoring_clients_head,
+ monitoring_clients_tail,
+ mc);
+ GNUNET_SERVER_notification_context_add (nc, client);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Client %p started monitoring of the peer `%s'\n",
+ mc, GNUNET_i2s (peer));
+ 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
break;
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting message of type %u to client %X.\n",
+ "Transmitting message of type %u to client %p.\n",
ntohs (msg->type), tc);
#endif
GNUNET_CONTAINER_DLL_remove (tc->message_queue_head, tc->message_queue_tail,
client_disconnect_notification (void *cls, struct GNUNET_SERVER_Client *client)
{
struct TransportClient *tc;
+ struct MonitoringClient *mc;
struct ClientMessageQueueEntry *mqe;
if (client == NULL)
return;
+ mc = lookup_monitoring_client (client);
+ if (mc != NULL)
+ {
+ GNUNET_CONTAINER_DLL_remove (monitoring_clients_head,
+ monitoring_clients_tail,
+ mc);
+ GNUNET_free (mc);
+ }
tc = lookup_client (client);
if (tc == NULL)
return;
#if DEBUG_TRANSPORT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
- "Client %X disconnected, cleaning up.\n", tc);
+ "Client %p disconnected, cleaning up.\n", tc);
#endif
while (NULL != (mqe = tc->message_queue_head))
{
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);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
+ "Client %p sent START\n", tc);
#endif
if (tc != NULL)
{
/* 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",
+ "TransportClient %p ServerClient %p sent multiple START messages\n",
tc, tc->client);
#endif
GNUNET_break (0);
tc->send_payload = (0 != (2 & options));
unicast (tc, GST_hello_get (), GNUNET_NO);
GST_neighbours_iterate (¬ify_client_about_neighbour, tc);
+ GNUNET_CONTAINER_DLL_insert (clients_head, clients_tail, tc);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
return;
}
GNUNET_SERVER_disable_receive_done_warning (client);
+ if ((NULL == address) || (0 == address_len))
+ {
+ GNUNET_break_op (0);
+ }
papi->address_pretty_printer (papi->cls, plugin_name, address, address_len,
numeric, rtimeout, &transmit_address_to_client,
tc);
}
+/**
+ * Compose AddressIterateResponseMessage using the given peer and address.
+ *
+ * @param peer identity of the peer
+ * @param address the address, NULL on disconnect
+ * @return composed message
+ */
+static struct AddressIterateResponseMessage *
+compose_address_iterate_response_message (const struct GNUNET_PeerIdentity
+ *peer,
+ const struct GNUNET_HELLO_Address
+ *address)
+{
+ struct AddressIterateResponseMessage *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 = alen = 0;
+ size = (sizeof (struct AddressIterateResponseMessage) + alen + tlen);
+ msg = GNUNET_malloc (size);
+ msg->header.size = htons (size);
+ msg->header.type =
+ htons (GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE_RESPONSE);
+ msg->reserved = htonl (0);
+ msg->peer = *peer;
+ msg->addrlen = htonl (alen);
+ msg->pluginlen = htonl (tlen);
+ if (NULL != address)
+ {
+ addr = (char *) &msg[1];
+ memcpy (addr, address->address, alen);
+ memcpy (&addr[alen], address->transport_name, tlen);
+ }
+ return msg;
+}
+
+
/**
* Output the active address of connected neighbours to the given client.
*
{
struct GNUNET_SERVER_TransmitContext *tc = cls;
struct AddressIterateResponseMessage *msg;
- size_t size;
- size_t tlen;
- size_t alen;
- char *addr;
-
- tlen = strlen (address->transport_name) + 1;
- alen = address->address_length;
- size = (sizeof (struct AddressIterateResponseMessage) + alen + tlen);
- {
- char buf[size];
- msg = (struct AddressIterateResponseMessage *) buf;
- msg->reserved = htonl (0);
- msg->peer = *peer;
- msg->addrlen = htonl (alen);
- msg->pluginlen = htonl (tlen);
- addr = (char *) &msg[1];
- memcpy (addr, address->address, alen);
- memcpy (&addr[alen], address->transport_name, tlen);
- GNUNET_SERVER_transmit_context_append_data (tc,
- &buf[sizeof
- (struct
- GNUNET_MessageHeader)],
- size -
- sizeof (struct
- GNUNET_MessageHeader),
- GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE_RESPONSE);
- }
+ msg = compose_address_iterate_response_message (peer, address);
+ GNUNET_SERVER_transmit_context_append_message (tc, &msg->header);
+ GNUNET_free (msg);
}
return;
}
msg = (struct AddressIterateMessage *) message;
- if (GNUNET_YES != ntohl (msg->one_shot))
+ if ( (GNUNET_YES != ntohl (msg->one_shot)) &&
+ (NULL != lookup_monitoring_client (client)) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Address monitoring not implemented\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
+ "ServerClient %p tried to start monitoring twice\n",
+ client);
+ GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
if (address != NULL)
output_address (tc, &msg->peer, NULL, 0, address);
}
- GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
- GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE_RESPONSE);
+ if (GNUNET_YES != ntohl (msg->one_shot))
+ setup_monitoring_client (client, &msg->peer);
+ else
+ GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
+ GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE_RESPONSE);
GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
}
sizeof (struct BlacklistMessage)},
{NULL, NULL, 0, 0}
};
+ nc = GNUNET_SERVER_notification_context_create (server, 0);
GNUNET_SERVER_add_handlers (server, handlers);
GNUNET_SERVER_disconnect_notify (server, &client_disconnect_notification,
NULL);
void
GST_clients_stop ()
{
- /* nothing to do */
+ if (NULL != nc)
+ {
+ GNUNET_SERVER_notification_context_destroy (nc);
+ nc = NULL;
+ }
}
}
+/**
+ * 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
+ */
+void
+GST_clients_broadcast_address_notification (const struct GNUNET_PeerIdentity
+ *peer,
+ const struct GNUNET_HELLO_Address
+ *address)
+{
+ struct AddressIterateResponseMessage *msg;
+ struct MonitoringClient *mc;
+ static struct GNUNET_PeerIdentity all_zeros;
+
+ msg = compose_address_iterate_response_message (peer, address);
+ mc = monitoring_clients_head;
+ while (mc != NULL)
+ {
+ 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 (nc, mc->client,
+ &msg->header, GNUNET_NO);
+ }
+
+ mc = mc->next;
+ }
+ GNUNET_free (msg);
+}
+
+
/* end of file gnunet-service-transport_clients.c */
projects / oweals / gnunet.git / blobdiff