From 9d28dc341890a1a5963c99708f870326910ad42c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 30 Mar 2013 16:01:34 +0000 Subject: -more distance removing --- src/transport/plugin_transport_udp_broadcasting.c | 26 +++++++++++------------ src/transport/plugin_transport_unix.c | 5 ----- 2 files changed, 12 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/transport/plugin_transport_udp_broadcasting.c b/src/transport/plugin_transport_udp_broadcasting.c index 838aec5bc..e8e087276 100644 --- a/src/transport/plugin_transport_udp_broadcasting.c +++ b/src/transport/plugin_transport_udp_broadcasting.c @@ -145,9 +145,10 @@ broadcast_ipv4_mst_cb (void *cls, void *client, struct Plugin *plugin = cls; struct Mstv4Context *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)) @@ -157,29 +158,26 @@ broadcast_ipv4_mst_cb (void *cls, void *client, 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, _ diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c index a27144efa..646695f79 100644 --- a/src/transport/plugin_transport_unix.c +++ b/src/transport/plugin_transport_unix.c @@ -48,11 +48,6 @@ #define LOG(kind,...) GNUNET_log_from (kind, "transport-unix",__VA_ARGS__) -/* - * Transport cost to peer, always 1 for UNIX (direct connection) - */ -#define UNIX_DIRECT_DISTANCE 1 - #define DEFAULT_NAT_PORT 0 /** -- cgit v1.2.3