- missing header changes

2 files changed, 54 insertions, 7 deletions

diff --git a/src/include/gnunet_mesh_service.h b/src/include/gnunet_mesh_service.h
index a5ebcb1ce..b99c724b9 100644
--- a/src/include/gnunet_mesh_service.h
+++ b/src/include/gnunet_mesh_service.h
@@ -372,7 +372,9 @@ GNUNET_MESH_receive_done (struct GNUNET_MESH_Channel *channel);
  * @param target other endpoint of the channel
  */
 typedef void (*GNUNET_MESH_ChannelsCB) (void *cls,
-                                        uint32_t channel_number,
+                                        uint32_t root_channel_number,
+                                        uint32_t dest_channel_number,
+                                        uint32_t public_channel_number,
                                         const struct GNUNET_PeerIdentity *origin,
                                         const struct GNUNET_PeerIdentity *target);
 
@@ -391,6 +393,33 @@ typedef void (*GNUNET_MESH_ChannelCB) (void *cls,
 
 
 /**
+ * Method called to retrieve information about all tunnels in MESH.
+ *
+ * @param cls Closure.
+ * @param peer Peer in the channel's tree.
+ */
+typedef void (*GNUNET_MESH_TunnelsCB) (void *cls,
+                                       const struct GNUNET_PeerIdentity *peer);
+
+
+
+/**
+ * Method called to retrieve information about a specific tunnel the mesh peer
+ * has established, o`r is trying to establish.
+ *
+ * @param cls Closure.
+ * @param peer Peer in the channel's tree.
+ */
+typedef void (*GNUNET_MESH_TunnelCB) (void *cls,
+                                      const struct GNUNET_PeerIdentity *peer,
+                                      unsigned int channels,
+                                      unsigned int connections,
+                                      unsigned int estatus,
+                                      unsigned int cstatus
+                                     );
+
+
+/**
  * Request information about the running mesh peer.
  * The callback will be called for every channel known to the service,
  * listing all active peers that belong to the channel.
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 9d458ca1c..5b7bc591a 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -899,16 +899,34 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_NACK             287
 
 /**
- * Local information about all tunnels of service. DEPRECATED
+ * Local information about all channels of service.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNELS     287
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CHANNELS    287
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CHANNELS    290
 
 /**
- * Local information of service about a specific tunnel. DEPRECATED
+ * Local information of service about a specific channel.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL      288
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CHANNEL     288
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CHANNEL     291
+
+/**
+ * Local information about all tunnels of service.
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNELS     292
+
+/**
+ * Local information of service about a specific tunnel.
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL      293
+
+/**
+ * Local information about all connections of service.
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CONNECTIONS 294
+
+/**
+ * Local information of service about a specific connection.
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_CONNECTION  295
 
 /**
  * Traffic (net-cat style) used by the Command Line Interface.