1 files changed, 107 insertions, 107 deletions

diff --git a/src/include/gnunet_mesh_service.h b/src/include/gnunet_mesh_service.h
index e49b89556..e69c9eaa7 100644
--- a/src/include/gnunet_mesh_service.h
+++ b/src/include/gnunet_mesh_service.h
@@ -19,13 +19,13 @@
 */
 
 /**
- * @file include/gnunet_mesh_service.h
- * @brief mesh service; establish channels to distant peers
+ * @file include/gnunet_cadet_service.h
+ * @brief cadet service; establish channels to distant peers
  * @author Christian Grothoff
  */
 
-#ifndef GNUNET_MESH_SERVICE_H
-#define GNUNET_MESH_SERVICE_H
+#ifndef GNUNET_CADET_SERVICE_H
+#define GNUNET_CADET_SERVICE_H
 
 #ifdef __cplusplus
 extern "C"
@@ -39,66 +39,66 @@ extern "C"
 #include "gnunet_transport_service.h"
 
 /**
- * Version number of GNUnet-mesh API.
+ * Version number of GNUnet-cadet API.
  */
-#define GNUNET_MESH_VERSION 0x00000003
+#define GNUNET_CADET_VERSION 0x00000003
 
 
 /**
  * Opaque handle to the service.
  */
-struct GNUNET_MESH_Handle;
+struct GNUNET_CADET_Handle;
 
 /**
  * Opaque handle to a channel.
  */
-struct GNUNET_MESH_Channel;
+struct GNUNET_CADET_Channel;
 
 /**
- * Hash to be used in Mesh communication. Only 256 bits needed,
+ * Hash to be used in Cadet communication. Only 256 bits needed,
  * instead of the 512 from @c GNUNET_HashCode.
  *
  */
-struct GNUNET_MESH_Hash
+struct GNUNET_CADET_Hash
 {
   unsigned char bits[256 / 8];
 };
 
 /**
  * Channel options.
- * Second line indicates filed in the MeshChannelInfo union carrying the answer.
+ * Second line indicates filed in the CadetChannelInfo union carrying the answer.
  */
-enum GNUNET_MESH_ChannelOption
+enum GNUNET_CADET_ChannelOption
 {
   /**
    * Default options: unreliable, default buffering, not out of order.
    */
-  GNUNET_MESH_OPTION_DEFAULT    = 0x0,
+  GNUNET_CADET_OPTION_DEFAULT    = 0x0,
 
   /**
    * Disable buffering on intermediate nodes (for minimum latency).
    * Yes/No.
    */
-  GNUNET_MESH_OPTION_NOBUFFER   = 0x1,
+  GNUNET_CADET_OPTION_NOBUFFER   = 0x1,
 
   /**
    * Enable channel reliability, lost messages will be retransmitted.
    * Yes/No.
    */
-  GNUNET_MESH_OPTION_RELIABLE   = 0x2,
+  GNUNET_CADET_OPTION_RELIABLE   = 0x2,
 
   /**
    * Enable out of order delivery of messages.
    * Yes/No.
    */
-  GNUNET_MESH_OPTION_OOORDER    = 0x4,
+  GNUNET_CADET_OPTION_OOORDER    = 0x4,
 
   /**
    * Who is the peer at the other end of the channel.
-   * Only for use in @c GNUNET_MESH_channel_get_info
+   * Only for use in @c GNUNET_CADET_channel_get_info
    * struct GNUNET_PeerIdentity *peer
    */
-  GNUNET_MESH_OPTION_PEER       = 0x8
+  GNUNET_CADET_OPTION_PEER       = 0x8
 
 };
 
@@ -107,19 +107,19 @@ enum GNUNET_MESH_ChannelOption
  * Functions with this signature are called whenever a message is
  * received.
  *
- * Each time the function must call #GNUNET_MESH_receive_done on the channel
+ * Each time the function must call #GNUNET_CADET_receive_done on the channel
  * in order to receive the next message. This doesn't need to be immediate:
  * can be delayed if some processing is done on the message.
  *
- * @param cls Closure (set from #GNUNET_MESH_connect).
+ * @param cls Closure (set from #GNUNET_CADET_connect).
  * @param channel Connection to the other end.
  * @param channel_ctx Place to store local state associated with the channel.
  * @param message The actual message.
  * @return #GNUNET_OK to keep the channel open,
  *         #GNUNET_SYSERR to close it (signal serious error).
  */
-typedef int (*GNUNET_MESH_MessageCallback) (void *cls,
-                                            struct GNUNET_MESH_Channel *channel,
+typedef int (*GNUNET_CADET_MessageCallback) (void *cls,
+                                            struct GNUNET_CADET_Channel *channel,
                                             void **channel_ctx,
                                             const struct GNUNET_MessageHeader *message);
 
@@ -128,12 +128,12 @@ typedef int (*GNUNET_MESH_MessageCallback) (void *cls,
  * Message handler.  Each struct specifies how to handle on particular
  * type of message received.
  */
-struct GNUNET_MESH_MessageHandler
+struct GNUNET_CADET_MessageHandler
 {
   /**
    * Function to call for messages of "type".
    */
-  GNUNET_MESH_MessageCallback callback;
+  GNUNET_CADET_MessageCallback callback;
 
   /**
    * Type of the message this handler covers.
@@ -153,29 +153,29 @@ struct GNUNET_MESH_MessageHandler
  * Method called whenever another peer has added us to a channel
  * the other peer initiated.
  * Only called (once) upon reception of data with a message type which was
- * subscribed to in #GNUNET_MESH_connect.
+ * subscribed to in #GNUNET_CADET_connect.
  *
- * A call to #GNUNET_MESH_channel_destroy causes te channel to be ignored. In
+ * A call to #GNUNET_CADET_channel_destroy causes te channel to be ignored. In
  * this case the handler MUST return NULL.
  *
  * @param cls closure
  * @param channel new handle to the channel
  * @param initiator peer that started the channel
  * @param port Port this channel is for.
- * @param options MeshOption flag field, with all active option bits set to 1.
+ * @param options CadetOption flag field, with all active option bits set to 1.
  *
  * @return initial channel context for the channel
  *         (can be NULL -- that's not an error)
  */
-typedef void *(GNUNET_MESH_InboundChannelNotificationHandler) (void *cls,
+typedef void *(GNUNET_CADET_InboundChannelNotificationHandler) (void *cls,
                                                                struct
-                                                               GNUNET_MESH_Channel
+                                                               GNUNET_CADET_Channel
                                                                * channel,
                                                                const struct
                                                                GNUNET_PeerIdentity
                                                                * initiator,
                                                                uint32_t port,
-                                                               enum GNUNET_MESH_ChannelOption
+                                                               enum GNUNET_CADET_ChannelOption
                                                                options);
 
 
@@ -183,21 +183,21 @@ typedef void *(GNUNET_MESH_InboundChannelNotificationHandler) (void *cls,
  * Function called whenever a channel is destroyed.  Should clean up
  * any associated state.
  *
- * It must NOT call #GNUNET_MESH_channel_destroy on the channel.
+ * It must NOT call #GNUNET_CADET_channel_destroy on the channel.
  *
- * @param cls closure (set from #GNUNET_MESH_connect)
+ * @param cls closure (set from #GNUNET_CADET_connect)
  * @param channel connection to the other end (henceforth invalid)
  * @param channel_ctx place where local state associated
  *                   with the channel is stored
  */
-typedef void (GNUNET_MESH_ChannelEndHandler) (void *cls,
-                                              const struct GNUNET_MESH_Channel *
+typedef void (GNUNET_CADET_ChannelEndHandler) (void *cls,
+                                              const struct GNUNET_CADET_Channel *
                                               channel,
                                               void *channel_ctx);
 
 
 /**
- * Connect to the mesh service.
+ * Connect to the cadet service.
  *
  * @param cfg Configuration to use.
  * @param cls Closure for the various callbacks that follow (including
@@ -206,59 +206,59 @@ typedef void (GNUNET_MESH_ChannelEndHandler) (void *cls,
  *                    Can be NULL if no inbound channels are desired.
  *                    See @a ports.
  * @param cleaner Function called when a channel is destroyed by the remote peer.
- *                It is NOT called if #GNUNET_MESH_channel_destroy is called on
+ *                It is NOT called if #GNUNET_CADET_channel_destroy is called on
  *                the channel.
  * @param handlers Callbacks for messages we care about, NULL-terminated. Each
- *                 one must call #GNUNET_MESH_receive_done on the channel to
+ *                 one must call #GNUNET_CADET_receive_done on the channel to
  *                 receive the next message.  Messages of a type that is not
  *                 in the handlers array are ignored if received.
  * @param ports NULL or 0-terminated array of port numbers for incoming channels.
  *              See @a new_channel.
  *
- * @return handle to the mesh service NULL on error
+ * @return handle to the cadet service NULL on error
  *         (in this case, init is never called)
  */
-struct GNUNET_MESH_Handle *
-GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, void *cls,
-                     GNUNET_MESH_InboundChannelNotificationHandler new_channel,
-                     GNUNET_MESH_ChannelEndHandler cleaner,
-                     const struct GNUNET_MESH_MessageHandler *handlers,
+struct GNUNET_CADET_Handle *
+GNUNET_CADET_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, void *cls,
+                     GNUNET_CADET_InboundChannelNotificationHandler new_channel,
+                     GNUNET_CADET_ChannelEndHandler cleaner,
+                     const struct GNUNET_CADET_MessageHandler *handlers,
                      const uint32_t *ports);
 
 
 /**
- * Disconnect from the mesh service. All channels will be destroyed. All channel
+ * Disconnect from the cadet service. All channels will be destroyed. All channel
  * disconnect callbacks will be called on any still connected peers, notifying
  * about their disconnection. The registered inbound channel cleaner will be
  * called should any inbound channels still exist.
  *
- * @param handle connection to mesh to disconnect
+ * @param handle connection to cadet to disconnect
  */
 void
-GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle);
+GNUNET_CADET_disconnect (struct GNUNET_CADET_Handle *handle);
 
 
 /**
  * Create a new channel towards a remote peer.
  *
  * If the destination port is not open by any peer or the destination peer
- * does not accept the channel, #GNUNET_MESH_ChannelEndHandler will be called
+ * does not accept the channel, #GNUNET_CADET_ChannelEndHandler will be called
  * for this channel.
  *
- * @param h mesh handle
+ * @param h cadet handle
  * @param channel_ctx client's channel context to associate with the channel
  * @param peer peer identity the channel should go to
  * @param port Port number.
- * @param options MeshOption flag field, with all desired option bits set to 1.
+ * @param options CadetOption flag field, with all desired option bits set to 1.
  *
  * @return handle to the channel
  */
-struct GNUNET_MESH_Channel *
-GNUNET_MESH_channel_create (struct GNUNET_MESH_Handle *h,
+struct GNUNET_CADET_Channel *
+GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h,
                             void *channel_ctx,
                             const struct GNUNET_PeerIdentity *peer,
                             uint32_t port,
-                            enum GNUNET_MESH_ChannelOption options);
+                            enum GNUNET_CADET_ChannelOption options);
 
 
 /**
@@ -271,13 +271,13 @@ GNUNET_MESH_channel_create (struct GNUNET_MESH_Handle *h,
  * @param channel Channel handle, becomes invalid after this call.
  */
 void
-GNUNET_MESH_channel_destroy (struct GNUNET_MESH_Channel *channel);
+GNUNET_CADET_channel_destroy (struct GNUNET_CADET_Channel *channel);
 
 
 /**
  * Struct to retrieve info about a channel.
  */
-union GNUNET_MESH_ChannelInfo
+union GNUNET_CADET_ChannelInfo
 {
 
   /**
@@ -296,23 +296,23 @@ union GNUNET_MESH_ChannelInfo
  * Get information about a channel.
  *
  * @param channel Channel handle.
- * @param option Query type GNUNET_MESH_OPTION_*
+ * @param option Query type GNUNET_CADET_OPTION_*
  * @param ... dependant on option, currently not used
  * @return Union with an answer to the query.
  */
-const union GNUNET_MESH_ChannelInfo *
-GNUNET_MESH_channel_get_info (struct GNUNET_MESH_Channel *channel,
-                              enum GNUNET_MESH_ChannelOption option, ...);
+const union GNUNET_CADET_ChannelInfo *
+GNUNET_CADET_channel_get_info (struct GNUNET_CADET_Channel *channel,
+                              enum GNUNET_CADET_ChannelOption option, ...);
 
 
 /**
  * Handle for a transmission request.
  */
-struct GNUNET_MESH_TransmitHandle;
+struct GNUNET_CADET_TransmitHandle;
 
 
 /**
- * Ask the mesh to call @a notify once it is ready to transmit the
+ * Ask the cadet to call @a notify once it is ready to transmit the
  * given number of bytes to the specified channel.
  * Only one call can be active at any time, to issue another request,
  * wait for the callback or cancel the current request.
@@ -330,8 +330,8 @@ struct GNUNET_MESH_TransmitHandle;
  *         NULL if we can not even queue the request (insufficient
  *         memory); if NULL is returned, @a notify will NOT be called.
  */
-struct GNUNET_MESH_TransmitHandle *
-GNUNET_MESH_notify_transmit_ready (struct GNUNET_MESH_Channel *channel,
+struct GNUNET_CADET_TransmitHandle *
+GNUNET_CADET_notify_transmit_ready (struct GNUNET_CADET_Channel *channel,
                                    int cork,
                                    struct GNUNET_TIME_Relative maxdelay,
                                    size_t notify_size,
@@ -345,7 +345,7 @@ GNUNET_MESH_notify_transmit_ready (struct GNUNET_MESH_Channel *channel,
  * @param th handle that was returned by "notify_transmit_ready".
  */
 void
-GNUNET_MESH_notify_transmit_ready_cancel (struct GNUNET_MESH_TransmitHandle
+GNUNET_CADET_notify_transmit_ready_cancel (struct GNUNET_CADET_TransmitHandle
                                           *th);
 
 
@@ -357,23 +357,23 @@ GNUNET_MESH_notify_transmit_ready_cancel (struct GNUNET_MESH_TransmitHandle
  * @param channel Channel that will be allowed to call another handler.
  */
 void
-GNUNET_MESH_receive_done (struct GNUNET_MESH_Channel *channel);
+GNUNET_CADET_receive_done (struct GNUNET_CADET_Channel *channel);
 
 
 
 /******************************************************************************/
 /********************       MONITORING /DEBUG API     *************************/
 /******************************************************************************/
-/* The following calls are not useful for normal MESH operation, but for      */
-/* debug and monitoring of the mesh state. They can be safely ignored.        */
+/* The following calls are not useful for normal CADET operation, but for      */
+/* debug and monitoring of the cadet state. They can be safely ignored.        */
 /* The API can change at any point without notice.                            */
 /* Please contact the developer if you consider any of this calls useful for  */
-/* normal mesh applications.                                                  */
+/* normal cadet applications.                                                  */
 /******************************************************************************/
 
 
 /**
- * Method called to retrieve information about a specific channel the mesh peer
+ * Method called to retrieve information about a specific channel the cadet peer
  * is aware of, including all transit nodes.
  *
  * @param cls Closure.
@@ -384,7 +384,7 @@ GNUNET_MESH_receive_done (struct GNUNET_MESH_Channel *channel);
  * @param dest_channel_number Local number for dest, if known.
  * @param public_channel_numbe Number for P2P, always known.
  */
-typedef void (*GNUNET_MESH_ChannelCB) (void *cls,
+typedef void (*GNUNET_CADET_ChannelCB) (void *cls,
                                        const struct GNUNET_PeerIdentity *root,
                                        const struct GNUNET_PeerIdentity *dest,
                                        uint32_t port,
@@ -393,7 +393,7 @@ typedef void (*GNUNET_MESH_ChannelCB) (void *cls,
                                        uint32_t public_channel_number);
 
 /**
- * Method called to retrieve information about all peers in MESH, called
+ * Method called to retrieve information about all peers in CADET, called
  * once per peer.
  *
  * After last peer has been reported, an additional call with NULL is done.
@@ -405,7 +405,7 @@ typedef void (*GNUNET_MESH_ChannelCB) (void *cls,
  * @param best_path How long is the best path?
  *                  (0 = unknown, 1 = ourselves, 2 = neighbor)
  */
-typedef void (*GNUNET_MESH_PeersCB) (void *cls,
+typedef void (*GNUNET_CADET_PeersCB) (void *cls,
                                      const struct GNUNET_PeerIdentity *peer,
                                      int tunnel, unsigned int n_paths,
                                      unsigned int best_path);
@@ -423,7 +423,7 @@ typedef void (*GNUNET_MESH_PeersCB) (void *cls,
  *              Each path starts with the local peer.
  *              Each path ends with the destination peer (given in @c peer).
  */
-typedef void (*GNUNET_MESH_PeerCB) (void *cls,
+typedef void (*GNUNET_CADET_PeerCB) (void *cls,
                                     const struct GNUNET_PeerIdentity *peer,
                                     int tunnel,
                                     int neighbor,
@@ -432,7 +432,7 @@ typedef void (*GNUNET_MESH_PeerCB) (void *cls,
 
 
 /**
- * Method called to retrieve information about all tunnels in MESH, called
+ * Method called to retrieve information about all tunnels in CADET, called
  * once per tunnel.
  *
  * After last tunnel has been reported, an additional call with NULL is done.
@@ -444,7 +444,7 @@ typedef void (*GNUNET_MESH_PeerCB) (void *cls,
  * @param estate Encryption state.
  * @param cstate Connectivity state.
  */
-typedef void (*GNUNET_MESH_TunnelsCB) (void *cls,
+typedef void (*GNUNET_CADET_TunnelsCB) (void *cls,
                                        const struct GNUNET_PeerIdentity *peer,
                                        unsigned int channels,
                                        unsigned int connections,
@@ -454,7 +454,7 @@ typedef void (*GNUNET_MESH_TunnelsCB) (void *cls,
 
 
 /**
- * Method called to retrieve information about a specific tunnel the mesh peer
+ * Method called to retrieve information about a specific tunnel the cadet peer
  * has established, o`r is trying to establish.
  *
  * @param cls Closure.
@@ -466,51 +466,51 @@ typedef void (*GNUNET_MESH_TunnelsCB) (void *cls,
  * @param estate Encryption state.
  * @param cstate Connectivity state.
  */
-typedef void (*GNUNET_MESH_TunnelCB) (void *cls,
+typedef void (*GNUNET_CADET_TunnelCB) (void *cls,
                                       const struct GNUNET_PeerIdentity *peer,
                                       unsigned int n_channels,
                                       unsigned int n_connections,
                                       uint32_t *channels,
-                                      struct GNUNET_MESH_Hash *connections,
+                                      struct GNUNET_CADET_Hash *connections,
                                       unsigned int estate,
                                       unsigned int cstate);
 
 /**
- * Request information about a specific channel of the running mesh peer.
+ * Request information about a specific channel of the running cadet peer.
  *
  * WARNING: unstable API, likely to change in the future!
  *
- * @param h Handle to the mesh peer.
+ * @param h Handle to the cadet peer.
  * @param peer ID of the other end of the channel.
  * @param channel_number Channel number.
  * @param callback Function to call with the requested data.
  * @param callback_cls Closure for @c callback.
  */
 void
-GNUNET_MESH_get_channel (struct GNUNET_MESH_Handle *h,
+GNUNET_CADET_get_channel (struct GNUNET_CADET_Handle *h,
                          struct GNUNET_PeerIdentity *peer,
                          uint32_t channel_number,
-                         GNUNET_MESH_ChannelCB callback,
+                         GNUNET_CADET_ChannelCB callback,
                          void *callback_cls);
 
 
 /**
- * Request information about peers known to the running mesh service.
+ * Request information about peers known to the running cadet service.
  * The callback will be called for every peer known to the service.
  * Only one info request (of any kind) can be active at once.
  *
  *
  * WARNING: unstable API, likely to change in the future!
  *
- * @param h Handle to the mesh peer.
+ * @param h Handle to the cadet peer.
  * @param callback Function to call with the requested data.
  * @param callback_cls Closure for @c callback.
  *
  * @return #GNUNET_OK / #GNUNET_SYSERR
  */
 int
-GNUNET_MESH_get_peers (struct GNUNET_MESH_Handle *h,
-                       GNUNET_MESH_PeersCB callback,
+GNUNET_CADET_get_peers (struct GNUNET_CADET_Handle *h,
+                       GNUNET_CADET_PeersCB callback,
                        void *callback_cls);
 
 /**
@@ -518,22 +518,22 @@ GNUNET_MESH_get_peers (struct GNUNET_MESH_Handle *h,
  *
  * WARNING: unstable API, likely to change in the future!
  *
- * @param h Mesh handle.
+ * @param h Cadet handle.
  *
- * @return Closure given to GNUNET_MESH_get_peers.
+ * @return Closure given to GNUNET_CADET_get_peers.
  */
 void *
-GNUNET_MESH_get_peers_cancel (struct GNUNET_MESH_Handle *h);
+GNUNET_CADET_get_peers_cancel (struct GNUNET_CADET_Handle *h);
 
 
 /**
- * Request information about a peer known to the running mesh peer.
+ * Request information about a peer known to the running cadet peer.
  * The callback will be called for the tunnel once.
  * Only one info request (of any kind) can be active at once.
  *
  * WARNING: unstable API, likely to change in the future!
  *
- * @param h Handle to the mesh peer.
+ * @param h Handle to the cadet peer.
  * @param id Peer whose tunnel to examine.
  * @param callback Function to call with the requested data.
  * @param callback_cls Closure for @c callback.
@@ -541,48 +541,48 @@ GNUNET_MESH_get_peers_cancel (struct GNUNET_MESH_Handle *h);
  * @return #GNUNET_OK / #GNUNET_SYSERR
  */
 int
-GNUNET_MESH_get_peer (struct GNUNET_MESH_Handle *h,
+GNUNET_CADET_get_peer (struct GNUNET_CADET_Handle *h,
                       const struct GNUNET_PeerIdentity *id,
-                      GNUNET_MESH_PeerCB callback,
+                      GNUNET_CADET_PeerCB callback,
                       void *callback_cls);
 
 /**
- * Request information about tunnels of the running mesh peer.
+ * Request information about tunnels of the running cadet peer.
  * The callback will be called for every tunnel of the service.
  * Only one info request (of any kind) can be active at once.
  *
  * WARNING: unstable API, likely to change in the future!
  *
- * @param h Handle to the mesh peer.
+ * @param h Handle to the cadet peer.
  * @param callback Function to call with the requested data.
  * @param callback_cls Closure for @c callback.
  *
  * @return #GNUNET_OK / #GNUNET_SYSERR
  */
 int
-GNUNET_MESH_get_tunnels (struct GNUNET_MESH_Handle *h,
-                         GNUNET_MESH_TunnelsCB callback,
+GNUNET_CADET_get_tunnels (struct GNUNET_CADET_Handle *h,
+                         GNUNET_CADET_TunnelsCB callback,
                          void *callback_cls);
 
 /**
  * Cancel a monitor request. The monitor callback will not be called.
  *
- * @param h Mesh handle.
+ * @param h Cadet handle.
  *
- * @return Closure given to GNUNET_MESH_monitor, if any.
+ * @return Closure given to GNUNET_CADET_monitor, if any.
  */
 void *
-GNUNET_MESH_get_tunnels_cancel (struct GNUNET_MESH_Handle *h);
+GNUNET_CADET_get_tunnels_cancel (struct GNUNET_CADET_Handle *h);
 
 
 /**
- * Request information about a tunnel of the running mesh peer.
+ * Request information about a tunnel of the running cadet peer.
  * The callback will be called for the tunnel once.
  * Only one info request (of any kind) can be active at once.
  *
  * WARNING: unstable API, likely to change in the future!
  *
- * @param h Handle to the mesh peer.
+ * @param h Handle to the cadet peer.
  * @param id Peer whose tunnel to examine.
  * @param callback Function to call with the requested data.
  * @param callback_cls Closure for @c callback.
@@ -590,13 +590,13 @@ GNUNET_MESH_get_tunnels_cancel (struct GNUNET_MESH_Handle *h);
  * @return #GNUNET_OK / #GNUNET_SYSERR
  */
 int
-GNUNET_MESH_get_tunnel (struct GNUNET_MESH_Handle *h,
+GNUNET_CADET_get_tunnel (struct GNUNET_CADET_Handle *h,
                         const struct GNUNET_PeerIdentity *id,
-                        GNUNET_MESH_TunnelCB callback,
+                        GNUNET_CADET_TunnelCB callback,
                         void *callback_cls);
 
 /**
- * Create a message queue for a mesh channel.
+ * Create a message queue for a cadet channel.
  * The message queue can only be used to transmit messages,
  * not to receive them.
  *
@@ -604,7 +604,7 @@ GNUNET_MESH_get_tunnel (struct GNUNET_MESH_Handle *h,
  * @return a message queue to messages over the channel
  */
 struct GNUNET_MQ_Handle *
-GNUNET_MESH_mq_create (struct GNUNET_MESH_Channel *channel);
+GNUNET_CADET_mq_create (struct GNUNET_CADET_Channel *channel);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */
@@ -614,6 +614,6 @@ GNUNET_MESH_mq_create (struct GNUNET_MESH_Channel *channel);
 }
 #endif
 
-/* ifndef GNUNET_MESH_SERVICE_H */
+/* ifndef GNUNET_CADET_SERVICE_H */
 #endif
-/* end of gnunet_mesh_service.h */
+/* end of gnunet_cadet_service.h */