2 files changed, 23 insertions, 15 deletions

diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index b16520429..825768034 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.
  */
@@ -932,8 +943,20 @@ 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_ChannelInfoOption option,
                                ...)
 {
+  static int bool_flag;
+
+  switch (option)
+  {
+    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;
 }
 
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index 4136dd5dd..6e3f6ee5e 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -355,21 +355,6 @@ struct CadetChannel
   unsigned int skip_ack_series;
 
   /**
-   * Is the tunnel bufferless (minimum latency)?
-   */
-  int nobuffer;
-
-  /**
-   * Is the tunnel reliable?
-   */
-  int reliable;
-
-  /**
-   * Is the tunnel out-of-order?
-   */
-  int out_of_order;
-
-  /**
    * Is this channel a loopback channel, where the destination is us again?
    */
   int is_loopback;