[GNUnet-SVN] r31763 - gnunet/src/include

[gnunet]

Author: bartpolot
Date: 2013-12-28 20:22:37 +0100 (Sat, 28 Dec 2013)
New Revision: 31763

Modified:
   gnunet/src/include/gnunet_mesh_service.h
   gnunet/src/include/gnunet_protocols.h
Log:
- missing header changes


Modified: gnunet/src/include/gnunet_mesh_service.h
===================================================================
--- gnunet/src/include/gnunet_mesh_service.h    2013-12-28 18:43:28 UTC (rev 
31762)
+++ gnunet/src/include/gnunet_mesh_service.h    2013-12-28 19:22:37 UTC (rev 
31763)
@@ -372,7 +372,9 @@
  * @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 @@
 
 
 /**
+ * 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.

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2013-12-28 18:43:28 UTC (rev 
31762)
+++ gnunet/src/include/gnunet_protocols.h       2013-12-28 19:22:37 UTC (rev 
31763)
@@ -899,18 +899,36 @@
 #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.
  */
 #define GNUNET_MESSAGE_TYPE_MESH_CLI                    298