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.
*/
/**
tc = setup_client (client);
tc->send_payload = (0 != (2 & options));
hello = GST_hello_get ();
- if (NULL == hello)
- {
- /* We are during startup and should have no neighbours, hence
- iteration with NULL must work. The HELLO will be sent to
- all clients once it has been created, so this should happen
- next anyway, and certainly before we get neighbours. */
- GST_neighbours_iterate (NULL, NULL);
- }
- else
- {
+ if (NULL != hello)
unicast (tc,
hello,
GNUNET_NO);
- GST_neighbours_iterate (¬ify_client_about_neighbour,
- tc);
- }
+ GST_neighbours_iterate (¬ify_client_about_neighbour,
+ tc);
GNUNET_SERVER_receive_done (client,
GNUNET_OK);
}
* Peer that was the target.
*/
struct GNUNET_PeerIdentity target;
+
+ /**
+ * At what time did we receive the message?
+ */
+ struct GNUNET_TIME_Absolute send_time;
};
{
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.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 (GST_neighbours_test_connected (&stcc->target))
+ {
+ /* Only send confirmation if we are still connected */
+ 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_free (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 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);
+ 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 ();
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);
+ &handle_send_transmit_continuation,
+ stcc);
}
sizeof (struct GNUNET_PeerIdentity)))
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
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,
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);
+ memcpy (name,
+ info->address->transport_name,
+ slen);
addr = &name[slen];
- memcpy (addr, info->address->address, alen);
+ 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_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) },