X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmesh%2Fmesh_enc.h;h=93a3a2e9e7dfaf3125b117f50567c21ec9a0e5dd;hb=056f559d916d785164f40e63ca56c153ea0e9ebe;hp=8b4fe8130bcead5fed4f810bb32ecc7a47e8b86a;hpb=87f78bbb75f670dec2bbbb33a876742ac1848367;p=oweals%2Fgnunet.git

diff --git a/src/mesh/mesh_enc.h b/src/mesh/mesh_enc.h
index 8b4fe8130..93a3a2e9e 100644
--- a/src/mesh/mesh_enc.h
+++ b/src/mesh/mesh_enc.h
@@ -135,9 +135,9 @@ struct GNUNET_MESH_LocalData
   struct GNUNET_MessageHeader header;
 
     /**
-     * TID of the channel
+     * ID of the channel
      */
-  uint32_t tid GNUNET_PACKED;
+  uint32_t id GNUNET_PACKED;
 
     /**
      * Payload follows
@@ -198,40 +198,6 @@ struct GNUNET_MESH_LocalMonitor
 
 GNUNET_NETWORK_STRUCT_END
 
-/******************************************************************************/
-/************************        ENUMERATIONS      ****************************/
-/******************************************************************************/
-
-/**
- * All the states a channel can be in.
- */
-enum MeshChannelState
-{
-    /**
-     * Uninitialized status, should never appear in operation.
-     */
-  MESH_TUNNEL_NEW,
-
-    /**
-     * Path to the peer not known yet
-     */
-  MESH_TUNNEL_SEARCHING,
-
-    /**
-     * Request sent, not yet answered.
-     */
-  MESH_TUNNEL_WAITING,
-
-    /**
-     * Peer connected and ready to accept data
-     */
-  MESH_TUNNEL_READY,
-
-    /**
-     * Peer connected previosly but not responding
-     */
-  MESH_TUNNEL_RECONNECTING
-};
 
 
 /**
@@ -275,9 +241,9 @@ GMC_min_pid (uint32_t a, uint32_t b);
  * Generated with:
  * FIND:        "#define ([^ ]+)[ ]*([0-9]+)"
  * REPLACE:     "    case \2: return "\1"; break;"
- * 
+ *
  * @param m Message type.
- * 
+ *
  * @return Human readable string description.
  */
 const char *