[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24873 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24873 - gnunet/src/transport |
Date: |
Fri, 9 Nov 2012 16:56:38 +0100 |
Author: wachs
Date: 2012-11-09 16:56:38 +0100 (Fri, 09 Nov 2012)
New Revision: 24873
Modified:
gnunet/src/transport/gnunet-service-transport_clients.c
gnunet/src/transport/gnunet-service-transport_neighbours.c
gnunet/src/transport/gnunet-transport.c
Log:
implement mantis 0002419
Modified: gnunet/src/transport/gnunet-service-transport_clients.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_clients.c 2012-11-09
15:13:40 UTC (rev 24872)
+++ gnunet/src/transport/gnunet-service-transport_clients.c 2012-11-09
15:56:38 UTC (rev 24873)
@@ -281,6 +281,7 @@
struct GNUNET_PeerIdentity *peer)
{
struct MonitoringClient *mc;
+ static struct GNUNET_PeerIdentity all_zeros;
GNUNET_assert (lookup_monitoring_client (client) == NULL);
mc = GNUNET_malloc (sizeof (struct MonitoringClient));
@@ -291,9 +292,13 @@
mc);
GNUNET_SERVER_notification_context_add (nc, client);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ 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;
}
@@ -1088,7 +1093,6 @@
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)
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2012-11-09
15:13:40 UTC (rev 24872)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2012-11-09
15:56:38 UTC (rev 24873)
@@ -754,6 +754,7 @@
{
GST_validation_set_address_use (na->address, na->session, GNUNET_NO,
__LINE__);
GNUNET_ATS_address_in_use (GST_ats, na->address, na->session, GNUNET_NO);
+ address_change_cb (NULL, &na->address->peer, NULL);
}
na->ats_active = GNUNET_NO;
@@ -787,7 +788,6 @@
int is_active)
{
struct GNUNET_TRANSPORT_PluginFunctions *papi;
-
if (NULL == (papi = GST_plugins_find (address->transport_name)))
{
GNUNET_break (0);
@@ -802,6 +802,8 @@
na->ats_active = is_active;
GNUNET_ATS_address_in_use (GST_ats, na->address, na->session, is_active);
GST_validation_set_address_use (na->address, na->session, is_active,
__LINE__);
+ if (is_active)
+ address_change_cb (NULL, &address->peer, address);
}
if (GNUNET_YES == is_active)
{
@@ -832,7 +834,7 @@
/* Telling ATS about new session */
GNUNET_ATS_address_in_use (GST_ats, na->address, na->session, GNUNET_YES);
GST_validation_set_address_use (na->address, na->session, GNUNET_YES,
__LINE__);
-
+ address_change_cb (NULL, &address->peer, address);
/* FIXME: is this the right place to set quotas? */
GST_neighbours_set_incoming_quota (&address->peer, bandwidth_in);
send_outbound_quota (&address->peer, bandwidth_out);
Modified: gnunet/src/transport/gnunet-transport.c
===================================================================
--- gnunet/src/transport/gnunet-transport.c 2012-11-09 15:13:40 UTC (rev
24872)
+++ gnunet/src/transport/gnunet-transport.c 2012-11-09 15:56:38 UTC (rev
24873)
@@ -847,7 +847,8 @@
{
peers = GNUNET_CONTAINER_multihashmap_create (20, GNUNET_NO);
address_resolution_in_progress = GNUNET_YES;
- pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL,
+ pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg,
+ (NULL == cpid) ? NULL : &pid,
GNUNET_YES,
TIMEOUT,
&process_address, (void *)
cfg);
@@ -856,7 +857,8 @@
{
peers = GNUNET_CONTAINER_multihashmap_create (20, GNUNET_NO);
address_resolution_in_progress = GNUNET_YES;
- pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL,
+ pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg,
+ (NULL == cpid) ? NULL : &pid,
GNUNET_NO,
TIMEOUT,
&process_address, (void *)
cfg);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24873 - gnunet/src/transport,
gnunet <=