/*
This file is part of GNUnet.
- (C) 2010-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2015 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
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.
*/
/**
};
+/**
+ * Closure for #handle_send_transmit_continuation()
+ */
+struct SendTransmitContinuationContext
+{
+ /**
+ * Client that made the request.
+ */
+ struct GNUNET_SERVER_Client *client;
+
+ /**
+ * Peer that was the target.
+ */
+ struct GNUNET_PeerIdentity target;
+
+ /**
+ * At what time did we receive the message?
+ */
+ struct GNUNET_TIME_Absolute send_time;
+
+ /**
+ * Unique ID, for logging.
+ */
+ unsigned long long uuid;
+
+ /**
+ * Set to #GNUNET_YES if the connection for @e target goes
+ * down and we thus must no longer send the
+ * #GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK message.
+ */
+ int down;
+};
+
+
/**
* Head of linked list of all clients to this service.
*/
*/
static struct TransportClient *clients_tail;
+/**
+ * Map of peer identities to active send transmit continuation
+ * contexts. Used to flag contexts as 'dead' when a connection goes
+ * down. Values are of type `struct SendTransmitContinuationContext
+ * *`.
+ */
+static struct GNUNET_CONTAINER_MultiPeerMap *active_stccs;
+
/**
* Head of linked list of all pending address iterations
*/
const struct GNUNET_MessageHeader *message)
{
const struct StartMessage *start;
+ const struct GNUNET_MessageHeader *hello;
struct TransportClient *tc;
uint32_t options;
tc = lookup_client (client);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Client %p sent START\n", tc);
if (NULL != tc)
{
/* got 'start' twice from the same client, not allowed */
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_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ 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);
}
}
-/**
- * Closure for #handle_send_transmit_continuation()
- */
-struct SendTransmitContinuationContext
-{
- /**
- * Client that made the request.
- */
- struct GNUNET_SERVER_Client *client;
-
- /**
- * Peer that was the target.
- */
- struct GNUNET_PeerIdentity target;
-};
-
-
/**
* Function called after the transmission is done. Notify the client that it is
* OK to send the next message.
{
struct SendTransmitContinuationContext *stcc = cls;
struct SendOkMessage send_ok_msg;
-
- if (GNUNET_OK == success)
- GST_neighbours_notify_payload_sent (&stcc->target,
- bytes_payload);
- 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.peer = stcc->target;
- GST_clients_unicast (stcc->client,
- &send_ok_msg.header,
- GNUNET_NO);
+ struct GNUNET_TIME_Relative delay;
+ const struct GNUNET_HELLO_Address *addr;
+
+ delay = GNUNET_TIME_absolute_get_duration (stcc->send_time);
+ addr = GST_neighbour_get_current_address (&stcc->target);
+ if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "It took us %s to send %u/%u bytes to %s (%d, %s)\n",
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES),
+ (unsigned int) bytes_payload,
+ (unsigned int) bytes_on_wire,
+ GNUNET_i2s (&stcc->target),
+ success,
+ (NULL != addr) ? addr->transport_name : "%");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "It took us %s to send %u/%u bytes to %s (%d, %s)\n",
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES),
+ (unsigned int) bytes_payload,
+ (unsigned int) bytes_on_wire,
+ GNUNET_i2s (&stcc->target),
+ success,
+ (NULL != addr) ? addr->transport_name : "%");
+
+ if (GNUNET_NO == stcc->down)
+ {
+ /* Only send confirmation if we are still connected */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending SEND_OK for transmission request %llu\n",
+ stcc->uuid);
+ 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.peer = stcc->target;
+ GST_clients_unicast (stcc->client,
+ &send_ok_msg.header,
+ GNUNET_NO);
+ }
GNUNET_SERVER_client_drop (stcc->client);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multipeermap_remove (active_stccs,
+ &stcc->target,
+ stcc));
GNUNET_free (stcc);
}
struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
+ static unsigned long long uuid_gen;
const struct OutboundMessage *obm;
const struct GNUNET_MessageHeader *obmm;
struct SendTransmitContinuationContext *stcc;
{
/* 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;
}
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_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",
+ "Received SEND request %llu for `%s' and first message of type %u and total size %u\n",
+ uuid_gen,
GNUNET_i2s (&obm->peer),
ntohs (obmm->type),
msize);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
stcc = GNUNET_new (struct SendTransmitContinuationContext);
stcc->target = obm->peer;
stcc->client = client;
+ stcc->send_time = GNUNET_TIME_absolute_get ();
+ stcc->uuid = uuid_gen++;
+ (void) GNUNET_CONTAINER_multipeermap_put (active_stccs,
+ &stcc->target,
+ stcc,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
GNUNET_SERVER_client_keep (client);
- GST_manipulation_send (&obm->peer, obmm, msize,
+ GST_manipulation_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)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Blacklist refuses connection attempt to peer `%s'\n"),
- GNUNET_i2s (peer));
- return; /* not allowed */
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Blacklist allows connection attempt to peer `%s'\n",
- GNUNET_i2s (peer));
-
- GST_neighbours_try_connect (peer);
-}
-
-
-/**
- * Handle request connect message
- *
- * @param cls closure (always NULL)
- * @param client identification of the client
- * @param message the actual message
- */
-static void
-clients_handle_request_connect (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *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 (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));
- (void) GST_blacklist_test_allowed (&trcm->peer,
- NULL,
- &try_connect_if_allowed,
- NULL);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * Handle request disconnect message
- *
- * @param cls closure (always NULL)
- * @param client identification of the client
- * @param message the actual message
- */
-static void
-clients_handle_request_disconnect (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
-{
- const struct TransportRequestDisconnectMessage *trdm;
-
- 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_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
- return;
- }
- 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);
+ &handle_send_transmit_continuation,
+ stcc);
}
papi = GST_plugins_printer_find (plugin_name);
if (NULL == papi)
{
+ 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);
actx->tc = tc;
GNUNET_CONTAINER_DLL_insert (a2s_head, a2s_tail, actx);
GNUNET_SERVER_disable_receive_done_warning (client);
+ 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,
* Output information of validation entries to the given client.
*
* @param cls the `struct IterationContext *`
- * @param peer identity of the neighbour
* @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
*/
static void
send_validation_information (void *cls,
- const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address,
struct GNUNET_TIME_Absolute last_validation,
struct GNUNET_TIME_Absolute valid_until,
struct ValidationIterateResponseMessage *msg;
if ( (GNUNET_YES != pc->all) &&
- (0 != memcmp (peer, &pc->id, sizeof (pc->id))) )
+ (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(peer),
+ GNUNET_i2s (&address->peer),
(NULL != address) ? GST_plugins_a2s (address) : "<none>");
- msg = compose_validation_iterate_response_message (peer, address);
+ 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);
client)) )
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
GNUNET_SERVER_disable_receive_done_warning (client);
pc.all = GNUNET_NO;
pc.id = msg->peer;
}
- GST_neighbours_iterate (&send_peer_information, &pc);
+ GST_neighbours_iterate (&send_peer_information,
+ &pc);
if (GNUNET_YES != ntohl (msg->one_shot))
{
- setup_peer_monitoring_client (client, &msg->peer);
+ 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_append_data (tc,
+ NULL,
+ 0,
+ GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_PEER_RESPONSE);
}
-
- GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
+ GNUNET_SERVER_transmit_context_run (tc,
+ GNUNET_TIME_UNIT_FOREVER_REL);
}
*/
static void
plugin_session_info_cb (void *cls,
- struct Session *session,
+ struct GNUNET_ATS_Session *session,
const struct GNUNET_TRANSPORT_SessionInfo *info)
{
struct TransportPluginMonitorMessage *msg;
if (0 == GNUNET_SERVER_notification_context_get_size (plugin_nc))
{
- fprintf (stderr, "UNSUB!\n");
- GST_plugins_monitor_subscribe (NULL, NULL);
+ GST_plugins_monitor_subscribe (NULL,
+ NULL);
return;
}
if ( (NULL == info) &&
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 + 1];
- memcpy (addr, info->address->address, alen);
+ 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,
{
GNUNET_SERVER_client_mark_monitor (client);
GNUNET_SERVER_disable_receive_done_warning (client);
- GNUNET_SERVER_notification_context_add (plugin_nc, client);
+ 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);
+ GST_plugins_monitor_subscribe (&plugin_session_info_cb,
+ NULL);
}
GNUNET_MESSAGE_TYPE_HELLO, 0},
{&clients_handle_send, NULL,
GNUNET_MESSAGE_TYPE_TRANSPORT_SEND, 0},
- {&clients_handle_request_connect, NULL,
- GNUNET_MESSAGE_TYPE_TRANSPORT_REQUEST_CONNECT,
- sizeof (struct TransportRequestConnectMessage)},
- {&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_BLACKLIST_REPLY,
sizeof (struct BlacklistMessage)},
{&GST_manipulation_set_metric, NULL,
- GNUNET_MESSAGE_TYPE_TRANSPORT_TRAFFIC_METRIC, 0},
+ 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}
};
+ active_stccs = GNUNET_CONTAINER_multipeermap_create (128,
+ GNUNET_YES);
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_notification_context_destroy (plugin_nc);
plugin_nc = NULL;
}
+ GNUNET_CONTAINER_multipeermap_destroy (active_stccs);
+ active_stccs = NULL;
}
{
struct TransportClient *tc;
+ 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) &&
}
+/**
+ * Mark the peer as down so we don't call the continuation
+ * context in the future.
+ *
+ * @param cls NULL
+ * @param peer peer that got disconnected
+ * @param value a `struct SendTransmitContinuationContext` to mark
+ * @return #GNUNET_OK (continue to iterate)
+ */
+static int
+mark_peer_down (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ void *value)
+{
+ struct SendTransmitContinuationContext *stcc = value;
+
+ stcc->down = GNUNET_YES;
+ return GNUNET_OK;
+}
+
+
+/**
+ * Notify all clients about a disconnect, and cancel
+ * pending SEND_OK messages for this peer.
+ *
+ * @param peer peer that disconnected
+ */
+void
+GST_clients_broadcast_disconnect (const struct GNUNET_PeerIdentity *peer)
+{
+ struct DisconnectInfoMessage disconnect_msg;
+
+ GNUNET_CONTAINER_multipeermap_get_multiple (active_stccs,
+ peer,
+ &mark_peer_down,
+ NULL);
+ disconnect_msg.header.size = htons (sizeof(struct DisconnectInfoMessage));
+ disconnect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT);
+ disconnect_msg.reserved = htonl (0);
+ disconnect_msg.peer = *peer;
+ GST_clients_broadcast (&disconnect_msg.header,
+ GNUNET_NO);
+
+}
+
+
/* end of file gnunet-service-transport_clients.c */