From 1fdcd4fa20f76fa8266e77567d12ce4b627c3d71 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Tue, 1 Apr 2014 00:16:19 +0000 Subject: [PATCH] - use small mesh hashes for info api --- src/mesh/gnunet-mesh.c | 11 ++++++----- src/mesh/gnunet-service-mesh_local.c | 2 +- src/mesh/mesh_api.c | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/mesh/gnunet-mesh.c b/src/mesh/gnunet-mesh.c index a502ab5fb..7677b244f 100644 --- a/src/mesh/gnunet-mesh.c +++ b/src/mesh/gnunet-mesh.c @@ -26,6 +26,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_mesh_service.h" +#include "mesh.h" /** @@ -510,7 +511,7 @@ tunnel_callback (void *cls, unsigned int n_channels, unsigned int n_connections, uint32_t *channels, - struct GNUNET_HashCode *connections, + struct GNUNET_MeshHash *connections, unsigned int estate, unsigned int cstate) { @@ -524,7 +525,7 @@ tunnel_callback (void *cls, FPRINTF (stdout, " %u\n", channels[i]); FPRINTF (stdout, "- %u connections\n", n_connections); for (i = 0; i < n_connections; i++) - FPRINTF (stdout, " %s\n", GNUNET_h2s_full (&connections[i])); + FPRINTF (stdout, " %s\n", GM_h2s (&connections[i])); FPRINTF (stdout, "- enc state: %u\n", estate); FPRINTF (stdout, "- con state: %u\n", cstate); } @@ -740,9 +741,9 @@ main (int argc, char *const *argv) // {'a', "channel", "TUNNEL_ID:CHANNEL_ID", // gettext_noop ("provide information about a particular channel"), // GNUNET_YES, &GNUNET_GETOPT_set_string, &channel_id}, -// {'b', "connection", "TUNNEL_ID:CONNECTION_ID", -// gettext_noop ("provide information about a particular connection"), -// GNUNET_YES, &GNUNET_GETOPT_set_string, &conn_id}, + {'C', "connection", "CONNECTION_ID", + gettext_noop ("provide information about a particular connection"), + GNUNET_YES, &GNUNET_GETOPT_set_string, &conn_id}, {'e', "echo", NULL, gettext_noop ("activate echo mode"), GNUNET_NO, &GNUNET_GETOPT_set_one, &echo}, diff --git a/src/mesh/gnunet-service-mesh_local.c b/src/mesh/gnunet-service-mesh_local.c index 84adb7d0e..8970571a4 100644 --- a/src/mesh/gnunet-service-mesh_local.c +++ b/src/mesh/gnunet-service-mesh_local.c @@ -805,7 +805,7 @@ handle_show_tunnel (void *cls, struct GNUNET_SERVER_Client *client, c_n = GMT_count_connections (t); size = sizeof (struct GNUNET_MESH_LocalInfoTunnel); - size += c_n * sizeof (struct GNUNET_HashCode); + size += c_n * sizeof (struct GNUNET_MeshHash); size += ch_n * sizeof (MESH_ChannelNumber); resp = GNUNET_malloc (size); diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c index ec5ddcf71..ff755c1ac 100644 --- a/src/mesh/mesh_api.c +++ b/src/mesh/mesh_api.c @@ -1108,7 +1108,7 @@ process_get_tunnel (struct GNUNET_MESH_Handle *h, size_t msize; unsigned int ch_n; unsigned int c_n; - struct GNUNET_HashCode *conns; + struct GNUNET_MeshHash *conns; MESH_ChannelNumber *chns; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Get Tunnel messasge received\n"); @@ -1131,7 +1131,7 @@ process_get_tunnel (struct GNUNET_MESH_Handle *h, ch_n = ntohl (msg->channels); c_n = ntohl (msg->connections); esize += ch_n * sizeof (MESH_ChannelNumber); - esize += c_n * sizeof (struct GNUNET_HashCode); + esize += c_n * sizeof (struct GNUNET_MeshHash); if (msize != esize) { GNUNET_break_op (0); @@ -1145,7 +1145,7 @@ process_get_tunnel (struct GNUNET_MESH_Handle *h, } /* Call Callback with tunnel info. */ - conns = (struct GNUNET_HashCode *) &msg[1]; + conns = (struct GNUNET_MeshHash *) &msg[1]; chns = (MESH_ChannelNumber *) &conns[c_n]; h->info_cb.tunnel_cb (h->info_cls, &msg->destination, ch_n, c_n, chns, conns, -- 2.25.1