From afef053a2ee08002fe50f3e1842e5c8153e6c507 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 30 Mar 2013 11:59:49 +0000 Subject: -no longer pass distance information from non-DV plugins --- src/transport/plugin_transport_udp_broadcasting.c | 28 +++++++++++------------ 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'src/transport/plugin_transport_udp_broadcasting.c') diff --git a/src/transport/plugin_transport_udp_broadcasting.c b/src/transport/plugin_transport_udp_broadcasting.c index 102e262ae..838aec5bc 100644 --- a/src/transport/plugin_transport_udp_broadcasting.c +++ b/src/transport/plugin_transport_udp_broadcasting.c @@ -89,7 +89,6 @@ struct Mstv6Context }; - int broadcast_ipv6_mst_cb (void *cls, void *client, const struct GNUNET_MessageHeader *message) @@ -98,9 +97,10 @@ broadcast_ipv6_mst_cb (void *cls, void *client, struct Plugin *plugin = cls; struct Mstv6Context *mc = client; const struct GNUNET_MessageHeader *hello; - struct UDP_Beacon_Message *msg; + const struct UDP_Beacon_Message *msg; + struct GNUNET_ATS_Information atsi; - msg = (struct UDP_Beacon_Message *) message; + msg = (const struct UDP_Beacon_Message *) message; if (GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON != ntohs (msg->header.type)) @@ -109,28 +109,25 @@ broadcast_ipv6_mst_cb (void *cls, void *client, "Received beacon with %u bytes from peer `%s' via address `%s'\n", ntohs (msg->header.size), GNUNET_i2s (&msg->sender), udp_address_to_string (NULL, &mc->addr, sizeof (mc->addr))); - struct GNUNET_ATS_Information atsi[2]; /* setup ATS */ - atsi[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE); - atsi[0].value = htonl (1); - atsi[1].type = htonl (GNUNET_ATS_NETWORK_TYPE); - atsi[1].value = mc->ats_address_network_type; + atsi.type = htonl (GNUNET_ATS_NETWORK_TYPE); + atsi.value = mc->ats_address_network_type; GNUNET_break (ntohl(mc->ats_address_network_type) != GNUNET_ATS_NET_UNSPECIFIED); hello = (struct GNUNET_MessageHeader *) &msg[1]; plugin->env->receive (plugin->env->cls, - &msg->sender, - hello, + &msg->sender, + hello, NULL, (const char *) &mc->addr, sizeof (mc->addr)); plugin->env->update_address_metrics (plugin->env->cls, - &msg->sender, - (const char *) &mc->addr, - sizeof (mc->addr), - NULL, - (struct GNUNET_ATS_Information *) &atsi, 2); + &msg->sender, + (const char *) &mc->addr, + sizeof (mc->addr), + NULL, + &atsi, 1); GNUNET_STATISTICS_update (plugin->env->stats, _ @@ -140,6 +137,7 @@ broadcast_ipv6_mst_cb (void *cls, void *client, return GNUNET_OK; } + int broadcast_ipv4_mst_cb (void *cls, void *client, const struct GNUNET_MessageHeader *message) -- cgit v1.2.3