- add peers info to mesh CLI and API

2 files changed, 48 insertions, 1 deletions

diff --git a/src/include/gnunet_mesh_service.h b/src/include/gnunet_mesh_service.h
index 97dc4619f..d7c74b6f9 100644
--- a/src/include/gnunet_mesh_service.h
+++ b/src/include/gnunet_mesh_service.h
@@ -391,6 +391,22 @@ typedef void (*GNUNET_MESH_ChannelCB) (void *cls,
                                       const struct GNUNET_PeerIdentity *peer,
                                       const struct GNUNET_PeerIdentity *parent);
 
+/**
+ * Method called to retrieve information about all peers in MESH, called
+ * once per peer.
+ *
+ * After last peer has been reported, an additional call with NULL is done.
+ *
+ * @param cls Closure.
+ * @param peer Peer, or NULL on "EOF".
+ * @param tunnel Do we have a tunnel towards this peer?
+ * @param best_path How long is the best path?
+ *                  (0 = unknown, 1 = ourselves, 2 = neighbor)
+ */
+typedef void (*GNUNET_MESH_PeersCB) (void *cls,
+                                     const struct GNUNET_PeerIdentity *peer,
+                                     int tunnel, unsigned int best_path);
+
 
 /**
  * Method called to retrieve information about all tunnels in MESH, called
@@ -486,6 +502,27 @@ void *
 GNUNET_MESH_get_channels_cancel (struct GNUNET_MESH_Handle *h);
 
 
+
+/**
+ * Request information about the running mesh peer.
+ * The callback will be called for every peer known to the service.
+ *
+ * If called again on the same handle, it will overwrite the previous
+ * callback and cls. To retrieve the cls, monitor_cancel must be
+ * called first.
+ *
+ * WARNING: unstable API, likely to change in the future!
+ *
+ * @param h Handle to the mesh peer.
+ * @param callback Function to call with the requested data.
+ * @param callback_cls Closure for @c callback.
+ */
+void
+GNUNET_MESH_get_peers (struct GNUNET_MESH_Handle *h,
+                       GNUNET_MESH_PeersCB callback,
+                       void *callback_cls);
+
+
 /**
  * Request information about the running mesh peer.
  * The callback will be called for every channel known to the service,
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 2a69e3029..77d7e216b 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -612,7 +612,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP                157
 
 /**
- * Trail to a particular peer is returned to this peer. 
+ * Trail to a particular peer is returned to this peer.
  */
 #define GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP_RESULT         158
 
@@ -933,6 +933,16 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CONNECTION  295
 
 /**
+ * Local information about all peers known to the service.
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_PEERS       296
+
+/**
+ * Local information of service about a specific peer.
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_PEER        297
+
+/**
  * Traffic (net-cat style) used by the Command Line Interface.
  */
 #define GNUNET_MESSAGE_TYPE_MESH_CLI                    298