[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26573 - gnunet/src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r26573 - gnunet/src/transport |
|
Date: |
Fri, 22 Mar 2013 16:50:08 +0100 |
Author: wachs
Date: 2013-03-22 16:50:08 +0100 (Fri, 22 Mar 2013)
New Revision: 26573
Modified:
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/gnunet-service-transport.h
gnunet/src/transport/gnunet-service-transport_manipulation.c
gnunet/src/transport/gnunet-service-transport_neighbours.c
gnunet/src/transport/test_plugin_transport.c
Log:
fixing ATS data
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2013-03-22 14:53:22 UTC
(rev 26572)
+++ gnunet/src/transport/gnunet-service-transport.c 2013-03-22 15:50:08 UTC
(rev 26573)
@@ -186,16 +186,9 @@
im->header.size = htons (size);
im->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_RECV);
im->peer = *peer;
-
- fprintf (stderr, "FIX THIS: %s:%u \n", __FILE__, __LINE__);
- /*
- ap[ats_count].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
- ap[ats_count].value =
- htonl ((uint32_t) GST_neighbour_get_latency (peer).rel_value);*/
memcpy (&im[1], message, ntohs (message->size));
GNUNET_ATS_address_add (GST_ats, address, session, NULL, 0);
- GNUNET_ATS_address_update (GST_ats, address, session, NULL, 0);
GST_clients_broadcast (&im->header, GNUNET_YES);
return ret;
@@ -407,6 +400,16 @@
return GNUNET_ATS_address_get_type(GST_ats, addr, addrlen);
}
+void
+GST_update_ats_metrics (struct GNUNET_PeerIdentity *peer,
+
struct GNUNET_HELLO_Address *address,
+
struct Session *session,
+
struct GNUNET_ATS_Information *ats,
+
uint32_t ats_count)
+{
+ GNUNET_ATS_address_update (GST_ats, address, session, ats, ats_count);
+}
+
/**
* Function that will be called to figure if an address is an loopback,
* LAN, WAN etc. address
@@ -418,8 +421,8 @@
*/
static void
plugin_env_update_metrics (void *cls,
-
const struct GNUNET_PeerIdentity *peer,
-
const char *address,
+
struct GNUNET_PeerIdentity *peer,
+
const void *address,
uint16_t address_len,
struct Session *session,
struct GNUNET_ATS_Information *ats,
@@ -437,7 +440,7 @@
haddress.address_length = address_len;
haddress.transport_name = plugin_name;
- GNUNET_ATS_address_update (GST_ats, &haddress, session, ats, ats_count);
+ GST_update_ats_metrics (peer, &haddress, session, ats, ats_count);
}
@@ -688,7 +691,7 @@
&plugin_env_address_change_notification,
&plugin_env_session_end,
&plugin_env_address_to_type,
- &GST_manipulation_metrics_recv);
+ &plugin_env_update_metrics);
GST_neighbours_start (NULL,
&neighbours_connect_notification,
&neighbours_disconnect_notification,
Modified: gnunet/src/transport/gnunet-service-transport.h
===================================================================
--- gnunet/src/transport/gnunet-service-transport.h 2013-03-22 14:53:22 UTC
(rev 26572)
+++ gnunet/src/transport/gnunet-service-transport.h 2013-03-22 15:50:08 UTC
(rev 26573)
@@ -97,6 +97,12 @@
const char *sender_address,
uint16_t sender_address_len);
+void
+GST_update_ats_metrics (struct GNUNET_PeerIdentity *peer,
+
struct GNUNET_HELLO_Address *address,
+
struct Session *session,
+
struct GNUNET_ATS_Information *ats,
+
uint32_t ats_count);
#endif
/* end of file gnunet-service-transport_plugins.h */
Modified: gnunet/src/transport/gnunet-service-transport_manipulation.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_manipulation.c
2013-03-22 14:53:22 UTC (rev 26572)
+++ gnunet/src/transport/gnunet-service-transport_manipulation.c
2013-03-22 15:50:08 UTC (rev 26573)
@@ -357,7 +357,7 @@
*/
void
GST_manipulation_metrics_recv (void *cls,
-
const struct
GNUNET_PeerIdentity *peer,
+
struct GNUNET_PeerIdentity
*peer,
const char *address,
uint16_t address_len,
struct Session *session,
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2013-03-22
14:53:22 UTC (rev 26572)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2013-03-22
15:50:08 UTC (rev 26573)
@@ -1543,10 +1543,10 @@
else
latency = n->latency.rel_value;
ats.value = htonl (latency);
- fprintf (stderr, "FIX THIS: %s %u \n", __FILE__, __LINE__);
- GNUNET_ATS_address_update (GST_ats,
- n->primary_address.address,
- n->primary_address.session, &ats, 1);
+ GST_update_ats_metrics (&n->id,
+
n->primary_address.address,
+
n->primary_address.session,
+
&ats, 1);
}
Modified: gnunet/src/transport/test_plugin_transport.c
===================================================================
--- gnunet/src/transport/test_plugin_transport.c 2013-03-22 14:53:22 UTC
(rev 26572)
+++ gnunet/src/transport/test_plugin_transport.c 2013-03-22 15:50:08 UTC
(rev 26573)
@@ -484,12 +484,12 @@
static void
env_update_metrics (void *cls,
-
const struct GNUNET_PeerIdentity *peer,
-
const char *address,
-
uint16_t address_len,
-
struct Session *session,
-
struct GNUNET_ATS_Information *ats,
-
uint32_t ats_count)
+ struct GNUNET_PeerIdentity *peer,
+ const void *address,
+ uint16_t address_len,
+ struct Session *session,
+ struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count)
{
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26573 - gnunet/src/transport,
gnunet <=