- moved timeout handling responsibility from for nat tests from caller to the library

[oweals/gnunet.git] / src / cadet / gnunet-service-cadet_channel.h

diff --git a/src/cadet/gnunet-service-cadet_channel.h b/src/cadet/gnunet-service-cadet_channel.h
index f5a89a4233016e7b48e8000c25beb1c9faea737b..c96958cf9e65af168a60dd8178eca6869b441c06 100644 (file)
--- a/src/cadet/gnunet-service-cadet_channel.h
+++ b/src/cadet/gnunet-service-cadet_channel.h
@@ -59,7 +59,7 @@ struct CadetChannel;
  * @param ch Channel to destroy.
  */
 void
-GMCH_destroy (struct CadetChannel *ch);
+GCCH_destroy (struct CadetChannel *ch);
 
 
 /**
@@ -70,7 +70,7 @@ GMCH_destroy (struct CadetChannel *ch);
  * @return ID used to identify the channel with the remote peer.
  */
 CADET_ChannelNumber
-GMCH_get_id (const struct CadetChannel *ch);
+GCCH_get_id (const struct CadetChannel *ch);
 
 /**
  * Get the channel tunnel.
@@ -79,8 +79,8 @@ GMCH_get_id (const struct CadetChannel *ch);
  *
  * @return tunnel of the channel.
  */
-struct CadetTunnel3 *
-GMCH_get_tunnel (const struct CadetChannel *ch);
+struct CadetTunnel *
+GCCH_get_tunnel (const struct CadetChannel *ch);
 
 /**
  * Get free buffer space towards the client on a specific channel.
@@ -91,7 +91,7 @@ GMCH_get_tunnel (const struct CadetChannel *ch);
  * @return Free buffer space [0 - 64]
  */
 unsigned int
-GMCH_get_buffer (struct CadetChannel *ch, int fwd);
+GCCH_get_buffer (struct CadetChannel *ch, int fwd);
 
 
 /**
@@ -103,7 +103,7 @@ GMCH_get_buffer (struct CadetChannel *ch, int fwd);
  * @return #GNUNET_YES if client is allowed to send us data.
  */
 int
-GMCH_get_allowed (struct CadetChannel *ch, int fwd);
+GCCH_get_allowed (struct CadetChannel *ch, int fwd);
 
 
 /**
@@ -115,7 +115,7 @@ GMCH_get_allowed (struct CadetChannel *ch, int fwd);
  * @return #GNUNET_YES in case it is.
  */
 int
-GMCH_is_origin (struct CadetChannel *ch, int fwd);
+GCCH_is_origin (struct CadetChannel *ch, int fwd);
 
 /**
  * Is the destination client for this channel on this peer?
@@ -126,7 +126,7 @@ GMCH_is_origin (struct CadetChannel *ch, int fwd);
  * @return #GNUNET_YES in case it is.
  */
 int
-GMCH_is_terminal (struct CadetChannel *ch, int fwd);
+GCCH_is_terminal (struct CadetChannel *ch, int fwd);
 
 /**
  * Send an end-to-end ACK message for the most recent in-sequence payload.
@@ -137,7 +137,7 @@ GMCH_is_terminal (struct CadetChannel *ch, int fwd);
  * @param fwd Is for FWD traffic? (ACK dest->owner)
  */
 void
-GMCH_send_data_ack (struct CadetChannel *ch, int fwd);
+GCCH_send_data_ack (struct CadetChannel *ch, int fwd);
 
 /**
  * Notify the destination client that a new incoming channel was created.
@@ -145,7 +145,7 @@ GMCH_send_data_ack (struct CadetChannel *ch, int fwd);
  * @param ch Channel that was created.
  */
 void
-GMCH_send_create (struct CadetChannel *ch);
+GCCH_send_create (struct CadetChannel *ch);
 
 /**
  * Allow a client to send us more data, in case it was choked.
@@ -154,7 +154,7 @@ GMCH_send_create (struct CadetChannel *ch);
  * @param fwd Is this about FWD traffic? (Root client).
  */
 void
-GMCH_allow_client (struct CadetChannel *ch, int fwd);
+GCCH_allow_client (struct CadetChannel *ch, int fwd);
 
 /**
  * Log channel info.
@@ -162,7 +162,7 @@ GMCH_allow_client (struct CadetChannel *ch, int fwd);
  * @param ch Channel.
  */
 void
-GMCH_debug (struct CadetChannel *ch);
+GCCH_debug (struct CadetChannel *ch);
 
 /**
  * Handle an ACK given by a client.
@@ -173,7 +173,7 @@ GMCH_debug (struct CadetChannel *ch);
  * @param fwd Is this a "FWD ACK"? (FWD ACKs are sent by root and go BCK)
  */
 void
-GMCH_handle_local_ack (struct CadetChannel *ch, int fwd);
+GCCH_handle_local_ack (struct CadetChannel *ch, int fwd);
 
 /**
  * Handle data given by a client.
@@ -190,7 +190,7 @@ GMCH_handle_local_ack (struct CadetChannel *ch, int fwd);
  * @return GNUNET_OK if everything goes well, GNUNET_SYSERR in case of en error.
  */
 int
-GMCH_handle_local_data (struct CadetChannel *ch,
+GCCH_handle_local_data (struct CadetChannel *ch,
                         struct CadetClient *c,
                         struct GNUNET_MessageHeader *message,
                         int fwd);
@@ -205,7 +205,7 @@ GMCH_handle_local_data (struct CadetChannel *ch,
  * @param is_root Is the request coming from root?
  */
 void
-GMCH_handle_local_destroy (struct CadetChannel *ch,
+GCCH_handle_local_destroy (struct CadetChannel *ch,
                            struct CadetClient *c,
                            int is_root);
 
@@ -220,7 +220,7 @@ GMCH_handle_local_destroy (struct CadetChannel *ch,
  * @return GNUNET_OK if everything went fine, GNUNET_SYSERR otherwise.
  */
 int
-GMCH_handle_local_create (struct CadetClient *c,
+GCCH_handle_local_create (struct CadetClient *c,
                           struct GNUNET_CADET_ChannelMessage *msg);
 
 /**
@@ -234,7 +234,7 @@ GMCH_handle_local_create (struct CadetClient *c,
  *            #GNUNET_SYSERR if message on a one-ended channel (remote)
  */
 void
-GMCH_handle_data (struct CadetChannel *ch,
+GCCH_handle_data (struct CadetChannel *ch,
                   const struct GNUNET_CADET_Data *msg,
                   int fwd);
 
@@ -249,7 +249,7 @@ GMCH_handle_data (struct CadetChannel *ch,
  *            #GNUNET_SYSERR if message on a one-ended channel (remote)
  */
 void
-GMCH_handle_data_ack (struct CadetChannel *ch,
+GCCH_handle_data_ack (struct CadetChannel *ch,
                       const struct GNUNET_CADET_DataACK *msg,
                       int fwd);
 
@@ -262,7 +262,7 @@ GMCH_handle_data_ack (struct CadetChannel *ch,
  * @param msg Channel crate message.
  */
 struct CadetChannel *
-GMCH_handle_create (struct CadetTunnel3 *t,
+GCCH_handle_create (struct CadetTunnel *t,
                     const struct GNUNET_CADET_ChannelCreate *msg);
 
 /**
@@ -273,7 +273,7 @@ GMCH_handle_create (struct CadetTunnel3 *t,
  * @param ch Channel.
  */
 void
-GMCH_handle_nack (struct CadetChannel *ch);
+GCCH_handle_nack (struct CadetChannel *ch);
 
 /**
  * Handler for channel ack messages.
@@ -286,7 +286,7 @@ GMCH_handle_nack (struct CadetChannel *ch);
  *            #GNUNET_SYSERR if message on a one-ended channel (remote)
  */
 void
-GMCH_handle_ack (struct CadetChannel *ch,
+GCCH_handle_ack (struct CadetChannel *ch,
                  const struct GNUNET_CADET_ChannelManage *msg,
                  int fwd);
 
@@ -301,7 +301,7 @@ GMCH_handle_ack (struct CadetChannel *ch,
  *            #GNUNET_SYSERR if message on a one-ended channel (remote)
  */
 void
-GMCH_handle_destroy (struct CadetChannel *ch,
+GCCH_handle_destroy (struct CadetChannel *ch,
                      const struct GNUNET_CADET_ChannelManage *msg,
                      int fwd);
 
@@ -322,7 +322,7 @@ GMCH_handle_destroy (struct CadetChannel *ch,
  * @param existing_copy This is a retransmission, don't save a copy.
  */
 void
-GMCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message,
+GCCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message,
                             struct CadetChannel *ch, int fwd,
                             void *existing_copy);
 
@@ -334,7 +334,7 @@ GMCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message,
  * @return Static string with the channel IDs.
  */
 const char *
-GMCH_2s (const struct CadetChannel *ch);
+GCCH_2s (const struct CadetChannel *ch);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */