1 files changed, 24 insertions, 24 deletions

diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index e141787a0..4bd5911ce 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -32,6 +32,17 @@
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "cadet-api", __VA_ARGS__)
 
+enum GNUNET_CADET_ChannelInfoOption
+{
+  /**
+   * Who is the peer at the other end of the channel.
+   * Only for use in @c GNUNET_CADET_channel_get_info
+   * struct GNUNET_PeerIdentity *peer
+   */
+  GNUNET_CADET_OPTION_PEER = 0x0
+
+};
+
 /**
  * Opaque handle to the service.
  */
@@ -134,11 +145,6 @@ struct GNUNET_CADET_Channel
   struct GNUNET_CADET_ClientChannelNumber ccn;
 
   /**
-   * Channel options: reliability, etc.
-   */
-  enum GNUNET_CADET_ChannelOption options;
-
-  /**
    * How many messages are we allowed to send to the service right now?
    */
   unsigned int allow_send;
@@ -578,7 +584,6 @@ handle_channel_created (
   ch = create_channel (h, &ccn);
   ch->peer = msg->peer;
   ch->incoming_port = port;
-  ch->options = ntohl (msg->opt);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Creating incoming channel %X [%s] %p\n",
        ntohl (ccn.channel_of_client),
@@ -938,29 +943,21 @@ GNUNET_CADET_channel_destroy (struct GNUNET_CADET_Channel *channel)
  */
 const union GNUNET_CADET_ChannelInfo *
 GNUNET_CADET_channel_get_info (struct GNUNET_CADET_Channel *channel,
-                               enum GNUNET_CADET_ChannelOption option,
+                               enum GNUNET_CADET_ChannelInfoOption option,
                                ...)
 {
   static int bool_flag;
 
   switch (option)
   {
-  case GNUNET_CADET_OPTION_NOBUFFER:
-  case GNUNET_CADET_OPTION_RELIABLE:
-  case GNUNET_CADET_OPTION_OUT_OF_ORDER:
-    if (0 != (option & channel->options))
-      bool_flag = GNUNET_YES;
-    else
-      bool_flag = GNUNET_NO;
-    return (const union GNUNET_CADET_ChannelInfo *) &bool_flag;
-    break;
-  case GNUNET_CADET_OPTION_PEER:
-    return (const union GNUNET_CADET_ChannelInfo *) &channel->peer;
-    break;
-  default:
-    GNUNET_break (0);
-    return NULL;
+    case GNUNET_CADET_OPTION_PEER:
+      return (const union GNUNET_CADET_ChannelInfo *) &channel->peer;
+      break;
+    default:
+      GNUNET_break (0);
+      return NULL;
   }
+  return (const union GNUNET_CADET_ChannelInfo *) &channel->peer;
 }
 
 
@@ -1089,7 +1086,6 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h,
                              void *channel_cls,
                              const struct GNUNET_PeerIdentity *destination,
                              const struct GNUNET_HashCode *port,
-                             enum GNUNET_CADET_ChannelOption options,
                              GNUNET_CADET_WindowSizeEventHandler window_changes,
                              GNUNET_CADET_DisconnectEventHandler disconnects,
                              const struct GNUNET_MQ_MessageHandler *handlers)
@@ -1106,7 +1102,6 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h,
   ch = create_channel (h, NULL);
   ch->ctx = channel_cls;
   ch->peer = *destination;
-  ch->options = options;
   ch->window_changes = window_changes;
   ch->disconnects = disconnects;
 
@@ -1125,8 +1120,13 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h,
   msg->ccn = ch->ccn;
   msg->port = *port;
   msg->peer = *destination;
+<<<<<<< 17611641fe7da3d2711e1f20eaf2ee81faf0e702
   msg->opt = htonl (options);
   GNUNET_MQ_send (h->mq, env);
+=======
+  GNUNET_MQ_send (h->mq,
+                  env);
+>>>>>>> removed GNUNET_CADET_ChannelOption
   return ch;
 }