Merge branch 'master' of ssh://gnunet.org/gnunet

2 files changed, 4 insertions, 4 deletions

diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index f599cf66b..2a00a7a02 100644
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -46,7 +46,7 @@ gnunet_service_multicast_SOURCES = \
  gnunet-service-multicast.c
 gnunet_service_multicast_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/cadet/libgnunetcadetnew.la \
+  $(top_builddir)/src/cadet/libgnunetcadet.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
 
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index b068f1308..cf39d3b22 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -1299,7 +1299,7 @@ cadet_channel_create (struct Group *grp, struct GNUNET_PeerIdentity *peer)
     GNUNET_MQ_handler_end ()
   };
 
-  chn->channel = GNUNET_CADET_channel_creatE (cadet, chn, &chn->peer,
+  chn->channel = GNUNET_CADET_channel_create (cadet, chn, &chn->peer,
                                               &grp->cadet_port_hash,
                                               GNUNET_CADET_OPTION_RELIABLE,
                                               cadet_notify_window_change,
@@ -1389,7 +1389,7 @@ handle_client_origin_start (void *cls,
     };
 
 
-    orig->cadet_port = GNUNET_CADET_open_porT (cadet,
+    orig->cadet_port = GNUNET_CADET_open_port (cadet,
                                                &grp->cadet_port_hash,
                                                cadet_notify_connect,
                                                NULL,
@@ -2082,7 +2082,7 @@ run (void *cls,
   replay_req_cadet = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
   replay_req_client = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
 
-  cadet = GNUNET_CADET_connecT (cfg);
+  cadet = GNUNET_CADET_connect (cfg);
 
   GNUNET_assert (NULL != cadet);