- fix CADET-using services

2 files changed, 12 insertions, 16 deletions

diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c
index 90a0c3b7f..5b24b3116 100644
--- a/src/fs/gnunet-service-fs_cadet_client.c
+++ b/src/fs/gnunet-service-fs_cadet_client.c
@@ -236,7 +236,7 @@ reset_cadet (struct CadetHandle *mh)
   mh->channel = GNUNET_CADET_channel_create (cadet_handle,
                                           mh,
                                           &mh->target,
-                                          GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER,
+                                          GC_u2h (GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER),
                                           GNUNET_CADET_OPTION_RELIABLE);
   transmit_pending (mh);
 }
@@ -547,7 +547,7 @@ get_cadet (const struct GNUNET_PeerIdentity *target)
   mh->channel = GNUNET_CADET_channel_create (cadet_handle,
                                             mh,
                                             &mh->target,
-                                            GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER,
+                                            GC_u2h (GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER),
                                             GNUNET_CADET_OPTION_RELIABLE);
   GNUNET_assert (mh ==
                  GNUNET_CONTAINER_multipeermap_get (cadet_map,
@@ -719,10 +719,8 @@ GSF_cadet_start_client ()
   cadet_map = GNUNET_CONTAINER_multipeermap_create (16, GNUNET_YES);
   cadet_handle = GNUNET_CADET_connect (GSF_cfg,
                                      NULL,
-                                     NULL,
                                      &cleaner_cb,
-                                     handlers,
-                                     NULL);
+                                     handlers);
 }
 
 
diff --git a/src/fs/gnunet-service-fs_cadet_server.c b/src/fs/gnunet-service-fs_cadet_server.c
index 21874b674..32fe4191a 100644
--- a/src/fs/gnunet-service-fs_cadet_server.c
+++ b/src/fs/gnunet-service-fs_cadet_server.c
@@ -472,7 +472,8 @@ static void *
 accept_cb (void *cls,
            struct GNUNET_CADET_Channel *channel,
            const struct GNUNET_PeerIdentity *initiator,
-           uint32_t port, enum GNUNET_CADET_ChannelOption options)
+           const struct GNUNET_HashCode *port,
+           enum GNUNET_CADET_ChannelOption options)
 {
   struct CadetClient *sc;
 
@@ -561,11 +562,6 @@ GSF_cadet_start_server ()
     { &request_cb, GNUNET_MESSAGE_TYPE_FS_CADET_QUERY, sizeof (struct CadetQueryMessage)},
     { NULL, 0, 0 }
   };
-  static const uint32_t ports[] = {
-    GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER,
-    0
-  };
-
   if (GNUNET_YES !=
       GNUNET_CONFIGURATION_get_value_number (GSF_cfg,
                                              "fs",
@@ -576,11 +572,13 @@ GSF_cadet_start_server ()
               "Initializing cadet FS server with a limit of %llu connections\n",
               sc_count_max);
   listen_channel = GNUNET_CADET_connect (GSF_cfg,
-                                       NULL,
-                                       &accept_cb,
-                                       &cleaner_cb,
-                                       handlers,
-                                       ports);
+                                         NULL,
+                                         &cleaner_cb,
+                                         handlers);
+  GNUNET_assert (NULL != listen_channel);
+  GNUNET_CADET_open_port (listen_channel,
+                          GC_u2h (GNUNET_APPLICATION_TYPE_FS_BLOCK_TRANSFER),
+                          &accept_cb, NULL);
 }