Added transition code for new MESH API

[oweals/gnunet.git] / src / mesh / mesh.h

diff --git a/src/mesh/mesh.h b/src/mesh/mesh.h
index 62bcf678280df130204069f3c56bdd9a4e621abc..8d6985a317b9649c116462b11540a100ec1abe47 100644 (file)
--- a/src/mesh/mesh.h
+++ b/src/mesh/mesh.h
@@ -27,8 +27,16 @@
 #define MESH_H_
 #include <stdint.h>
 
-#include <gnunet_mesh_service_new.h>
+#define MESH_DEBUG              GNUNET_YES
+
+
+#include "platform.h"
 #include "gnunet_common.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_peer_lib.h"
+#include "gnunet_core_service.h"
+#include "gnunet_protocols.h"
+#include <gnunet_mesh_service_new.h>
 
 /******************************************************************************/
 /********************        MESH LOCAL MESSAGES      *************************/
@@ -70,6 +78,8 @@
 #define GNUNET_MESH_LOCAL_TUNNEL_ID_CLI 0x80000000
 #define GNUNET_MESH_LOCAL_TUNNEL_ID_SERV 0xB0000000
 
+#define CORE_QUEUE_SIZE         10
+#define LOCAL_QUEUE_SIZE        100
 
 /******************************************************************************/
 /**************************        MESSAGES      ******************************/
@@ -97,7 +107,8 @@ struct GNUNET_MESH_ClientConnect
 
 /**
  * Type for tunnel numbering.
- * - Local tunnel numbers are >= 0x80000000
+ * - Local tunnel numbers given by the service (incoming) are >= 0xB0000000
+ * - Local tunnel numbers given by the client (created) are >= 0x80000000
  * - Global tunnel numbers are < 0x80000000
  */
 typedef uint32_t MESH_TunnelNumber;
@@ -199,4 +210,47 @@ struct GNUNET_MESH_ConnectPeerByType
   GNUNET_MESH_ApplicationType type GNUNET_PACKED;
 };
 
+
+/******************************************************************************/
+/************************        ENUMERATIONS      ****************************/
+/******************************************************************************/
+
+/**
+ * All the states a peer participating in a tunnel can be in.
+ */
+enum MeshPeerState
+{
+    /**
+     * Peer is the root and owner of the tree
+     */
+  MESH_PEER_ROOT,
+
+    /**
+     * Peer only retransmits traffic, is not a final destination
+     */
+  MESH_PEER_RELAY,
+
+    /**
+     * Path to the peer not known yet
+     */
+  MESH_PEER_SEARCHING,
+
+    /**
+     * Request sent, not yet answered.
+     */
+  MESH_PEER_WAITING,
+
+    /**
+     * Peer connected and ready to accept data
+     */
+  MESH_PEER_READY,
+
+    /**
+     * Peer connected previosly but not responding
+     */
+  MESH_PEER_RECONNECTING
+};
+
+
+
 #endif