[GNUnet-SVN] r32092 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2014-01-30 03:11:27 +0100 (Thu, 30 Jan 2014)
New Revision: 32092

Modified:
   gnunet/src/mesh/gnunet-mesh.c
   gnunet/src/mesh/mesh_api.c
Log:
- adapt mesh CLI to API changes

Modified: gnunet/src/mesh/gnunet-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-mesh.c       2014-01-30 02:11:25 UTC (rev 32091)
+++ gnunet/src/mesh/gnunet-mesh.c       2014-01-30 02:11:27 UTC (rev 32092)
@@ -439,12 +439,13 @@
  * @param cls Closure.
  * @param peer Peer, or NULL on "EOF".
  * @param tunnel Do we have a tunnel towards this peer?
+ * @param n_paths Number of known paths towards this peer.
  * @param best_path How long is the best path?
  *                  (0 = unknown, 1 = ourselves, 2 = neighbor)
  */
 static void
 peers_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
-                int tunnel, unsigned int best_path)
+                int tunnel, unsigned int n_paths, unsigned int best_path)
 {
   if (NULL == peer)
   {
@@ -454,8 +455,8 @@
     }
     return;
   }
-  FPRINTF (stdout, "%s tunnel: %c, best path %u hops]\n",
-           GNUNET_i2s_full (peer), tunnel ? 'Y' : 'N', best_path);
+  FPRINTF (stdout, "%s tunnel: %c, paths: %u\n",
+           GNUNET_i2s_full (peer), tunnel ? 'Y' : 'N', n_paths);
 }
 
 

Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c  2014-01-30 02:11:25 UTC (rev 32091)
+++ gnunet/src/mesh/mesh_api.c  2014-01-30 02:11:27 UTC (rev 32092)
@@ -1065,7 +1065,8 @@
 
   msg = (struct GNUNET_MESH_LocalInfoPeer *) message;
   h->peers_cb (h->peers_cls, &msg->destination,
-               (int) ntohs (msg->tunnel), ntohs (msg->paths), 0);
+               (int) ntohs (msg->tunnel), (unsigned int ) ntohs (msg->paths),
+               0);
 }