aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cadet/cadet_api.c8
-rw-r--r--src/cadet/cadet_test_lib.c4
-rw-r--r--src/cadet/gnunet-cadet.c6
-rw-r--r--src/cadet/test_cadet.c6
-rw-r--r--src/cadet/test_cadet_local_mq.c12
-rw-r--r--src/conversation/gnunet-service-conversation.c6
-rw-r--r--src/exit/gnunet-daemon-exit.c10
-rw-r--r--src/fs/gnunet-service-fs_cadet_client.c4
-rw-r--r--src/fs/gnunet-service-fs_cadet_server.c4
-rw-r--r--src/include/gnunet_cadet_service.h12
-rw-r--r--src/multicast/gnunet-service-multicast.c6
-rw-r--r--src/pt/gnunet-daemon-pt.c4
-rw-r--r--src/rps/gnunet-service-rps.c4
-rw-r--r--src/rps/gnunet-service-rps_peers.c2
-rw-r--r--src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c4
-rw-r--r--src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c4
-rw-r--r--src/scalarproduct/gnunet-service-scalarproduct_alice.c4
-rw-r--r--src/scalarproduct/gnunet-service-scalarproduct_bob.c4
-rw-r--r--src/set/gnunet-service-set.c6
-rw-r--r--src/vpn/gnunet-service-vpn.c4
20 files changed, 57 insertions, 57 deletions
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index c9f2a11bb..decf473a9 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -1547,12 +1547,12 @@ GC_u2h (uint32_t port)
1547 * @return Handle to the cadet service NULL on error. 1547 * @return Handle to the cadet service NULL on error.
1548 */ 1548 */
1549struct GNUNET_CADET_Handle * 1549struct GNUNET_CADET_Handle *
1550GNUNET_CADET_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg) 1550GNUNET_CADET_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
1551{ 1551{
1552 struct GNUNET_CADET_Handle *h; 1552 struct GNUNET_CADET_Handle *h;
1553 1553
1554 LOG (GNUNET_ERROR_TYPE_DEBUG, 1554 LOG (GNUNET_ERROR_TYPE_DEBUG,
1555 "GNUNET_CADET_connecT()\n"); 1555 "GNUNET_CADET_connect()\n");
1556 h = GNUNET_new (struct GNUNET_CADET_Handle); 1556 h = GNUNET_new (struct GNUNET_CADET_Handle);
1557 h->cfg = cfg; 1557 h->cfg = cfg;
1558 h->ports = GNUNET_CONTAINER_multihashmap_create (4, 1558 h->ports = GNUNET_CONTAINER_multihashmap_create (4,
@@ -1586,7 +1586,7 @@ GNUNET_CADET_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg)
1586 * @return Port handle. 1586 * @return Port handle.
1587 */ 1587 */
1588struct GNUNET_CADET_Port * 1588struct GNUNET_CADET_Port *
1589GNUNET_CADET_open_porT (struct GNUNET_CADET_Handle *h, 1589GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h,
1590 const struct GNUNET_HashCode *port, 1590 const struct GNUNET_HashCode *port,
1591 GNUNET_CADET_ConnectEventHandler connects, 1591 GNUNET_CADET_ConnectEventHandler connects,
1592 void * connects_cls, 1592 void * connects_cls,
@@ -1645,7 +1645,7 @@ GNUNET_CADET_open_porT (struct GNUNET_CADET_Handle *h,
1645 * @return Handle to the channel. 1645 * @return Handle to the channel.
1646 */ 1646 */
1647struct GNUNET_CADET_Channel * 1647struct GNUNET_CADET_Channel *
1648GNUNET_CADET_channel_creatE (struct GNUNET_CADET_Handle *h, 1648GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h,
1649 void *channel_cls, 1649 void *channel_cls,
1650 const struct GNUNET_PeerIdentity *destination, 1650 const struct GNUNET_PeerIdentity *destination,
1651 const struct GNUNET_HashCode *port, 1651 const struct GNUNET_HashCode *port,
diff --git a/src/cadet/cadet_test_lib.c b/src/cadet/cadet_test_lib.c
index b2131d49f..1df6bff0d 100644
--- a/src/cadet/cadet_test_lib.c
+++ b/src/cadet/cadet_test_lib.c
@@ -137,14 +137,14 @@ cadet_connect_adapter (void *cls,
137 struct GNUNET_CADET_Handle *h; 137 struct GNUNET_CADET_Handle *h;
138 unsigned int i; 138 unsigned int i;
139 139
140 h = GNUNET_CADET_connecT (cfg); 140 h = GNUNET_CADET_connect (cfg);
141 if (NULL == ctx->ports) 141 if (NULL == ctx->ports)
142 return h; 142 return h;
143 143
144 actx->ports = GNUNET_new_array (ctx->port_count, struct GNUNET_CADET_Port *); 144 actx->ports = GNUNET_new_array (ctx->port_count, struct GNUNET_CADET_Port *);
145 for (i = 0; i < ctx->port_count; i++) 145 for (i = 0; i < ctx->port_count; i++)
146 { 146 {
147 actx->ports[i] = GNUNET_CADET_open_porT (h, 147 actx->ports[i] = GNUNET_CADET_open_port (h,
148 ctx->ports[i], 148 ctx->ports[i],
149 ctx->connects, 149 ctx->connects,
150 (void *) (long) actx->peer, 150 (void *) (long) actx->peer,
diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c
index abbf9a0a7..1556f7d86 100644
--- a/src/cadet/gnunet-cadet.c
+++ b/src/cadet/gnunet-cadet.c
@@ -829,7 +829,7 @@ run (void *cls,
829 829
830 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 830 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
831 "Connecting to CADET service\n"); 831 "Connecting to CADET service\n");
832 mh = GNUNET_CADET_connecT (cfg); 832 mh = GNUNET_CADET_connect (cfg);
833 GNUNET_SCHEDULER_add_shutdown (&shutdown_task, 833 GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
834 NULL); 834 NULL);
835 if (NULL == mh) 835 if (NULL == mh)
@@ -844,7 +844,7 @@ run (void *cls,
844 GNUNET_CRYPTO_hash (listen_port, 844 GNUNET_CRYPTO_hash (listen_port,
845 strlen (listen_port), 845 strlen (listen_port),
846 &porthash); 846 &porthash);
847 lp = GNUNET_CADET_open_porT (mh, 847 lp = GNUNET_CADET_open_port (mh,
848 &porthash, 848 &porthash,
849 &channel_incoming, 849 &channel_incoming,
850 NULL, 850 NULL,
@@ -876,7 +876,7 @@ run (void *cls,
876 GNUNET_CRYPTO_hash (target_port, 876 GNUNET_CRYPTO_hash (target_port,
877 strlen(target_port), 877 strlen(target_port),
878 &porthash); 878 &porthash);
879 ch = GNUNET_CADET_channel_creatE (mh, 879 ch = GNUNET_CADET_channel_create (mh,
880 NULL, 880 NULL,
881 &pid, 881 &pid,
882 &porthash, 882 &porthash,
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index 4fe43b3bf..3586b26ac 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -705,12 +705,12 @@ handle_data (void *cls, const struct GNUNET_MessageHeader *message)
705/** 705/**
706 * Method called whenever a peer connects to a port in MQ-based CADET. 706 * Method called whenever a peer connects to a port in MQ-based CADET.
707 * 707 *
708 * @param cls Closure from #GNUNET_CADET_open_porT (peer # as long). 708 * @param cls Closure from #GNUNET_CADET_open_port (peer # as long).
709 * @param channel New handle to the channel. 709 * @param channel New handle to the channel.
710 * @param source Peer that started this channel. 710 * @param source Peer that started this channel.
711 * @return Closure for the incoming @a channel. It's given to: 711 * @return Closure for the incoming @a channel. It's given to:
712 * - The #GNUNET_CADET_DisconnectEventHandler (given to 712 * - The #GNUNET_CADET_DisconnectEventHandler (given to
713 * #GNUNET_CADET_open_porT) when the channel dies. 713 * #GNUNET_CADET_open_port) when the channel dies.
714 * - Each the #GNUNET_MQ_MessageCallback handlers for each message 714 * - Each the #GNUNET_MQ_MessageCallback handlers for each message
715 * received on the @a channel. 715 * received on the @a channel.
716 */ 716 */
@@ -840,7 +840,7 @@ start_test (void *cls)
840 } 840 }
841 841
842 ch = GNUNET_new (struct CadetTestChannelWrapper); 842 ch = GNUNET_new (struct CadetTestChannelWrapper);
843 outgoing_ch = GNUNET_CADET_channel_creatE (h1, 843 outgoing_ch = GNUNET_CADET_channel_create (h1,
844 ch, 844 ch,
845 p_id[1], 845 p_id[1],
846 &port, 846 &port,
diff --git a/src/cadet/test_cadet_local_mq.c b/src/cadet/test_cadet_local_mq.c
index 19bafbed1..3089c7fbb 100644
--- a/src/cadet/test_cadet_local_mq.c
+++ b/src/cadet/test_cadet_local_mq.c
@@ -132,12 +132,12 @@ do_abort (void *cls)
132/** 132/**
133 * Method called whenever a peer connects to a port in MQ-based CADET. 133 * Method called whenever a peer connects to a port in MQ-based CADET.
134 * 134 *
135 * @param cls Closure from #GNUNET_CADET_open_porT. 135 * @param cls Closure from #GNUNET_CADET_open_port.
136 * @param channel New handle to the channel. 136 * @param channel New handle to the channel.
137 * @param source Peer that started this channel. 137 * @param source Peer that started this channel.
138 * @return Closure for the incoming @a channel. It's given to: 138 * @return Closure for the incoming @a channel. It's given to:
139 * - The #GNUNET_CADET_DisconnectEventHandler (given to 139 * - The #GNUNET_CADET_DisconnectEventHandler (given to
140 * #GNUNET_CADET_open_porT) when the channel dies. 140 * #GNUNET_CADET_open_port) when the channel dies.
141 * - Each the #GNUNET_MQ_MessageCallback handlers for each message 141 * - Each the #GNUNET_MQ_MessageCallback handlers for each message
142 * received on the @a channel. 142 * received on the @a channel.
143 */ 143 */
@@ -235,7 +235,7 @@ do_connect (void *cls)
235 GNUNET_TESTING_peer_get_identity (me, &id); 235 GNUNET_TESTING_peer_get_identity (me, &id);
236 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 236 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
237 "creating channel\n"); 237 "creating channel\n");
238 ch = GNUNET_CADET_channel_creatE (cadet_peer_1, /* cadet handle */ 238 ch = GNUNET_CADET_channel_create (cadet_peer_1, /* cadet handle */
239 NULL, /* channel cls */ 239 NULL, /* channel cls */
240 &id, /* destination */ 240 &id, /* destination */
241 GC_u2h (TEST_MESSAGE_TYPE), /* port */ 241 GC_u2h (TEST_MESSAGE_TYPE), /* port */
@@ -282,8 +282,8 @@ run (void *cls,
282 abort_task = GNUNET_SCHEDULER_add_delayed (delay, 282 abort_task = GNUNET_SCHEDULER_add_delayed (delay,
283 &do_abort, 283 &do_abort,
284 (void *) (long) __LINE__); 284 (void *) (long) __LINE__);
285 cadet_peer_1 = GNUNET_CADET_connecT (cfg); 285 cadet_peer_1 = GNUNET_CADET_connect (cfg);
286 cadet_peer_2 = GNUNET_CADET_connecT (cfg); 286 cadet_peer_2 = GNUNET_CADET_connect (cfg);
287 287
288 if ( (NULL == cadet_peer_1) || 288 if ( (NULL == cadet_peer_1) ||
289 (NULL == cadet_peer_2) ) 289 (NULL == cadet_peer_2) )
@@ -297,7 +297,7 @@ run (void *cls,
297 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CADET 1: %p\n", cadet_peer_1); 297 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CADET 1: %p\n", cadet_peer_1);
298 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CADET 2: %p\n", cadet_peer_2); 298 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CADET 2: %p\n", cadet_peer_2);
299 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handlers 2: %p\n", handlers); 299 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handlers 2: %p\n", handlers);
300 GNUNET_CADET_open_porT (cadet_peer_2, /* cadet handle */ 300 GNUNET_CADET_open_port (cadet_peer_2, /* cadet handle */
301 GC_u2h (TEST_PORT_ID), /* port id */ 301 GC_u2h (TEST_PORT_ID), /* port id */
302 &connected, /* connect handler */ 302 &connected, /* connect handler */
303 (void *) 2L, /* handle for #connected */ 303 (void *) 2L, /* handle for #connected */
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index e61ed44a1..5f43bfe80 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -1109,7 +1109,7 @@ handle_client_call_message (void *cls,
1109 line->channel_tail, 1109 line->channel_tail,
1110 ch); 1110 ch);
1111 ch->status = CS_CALLER_CALLING; 1111 ch->status = CS_CALLER_CALLING;
1112 ch->channel = GNUNET_CADET_channel_creatE (cadet, 1112 ch->channel = GNUNET_CADET_channel_create (cadet,
1113 ch, 1113 ch,
1114 &msg->target, 1114 &msg->target,
1115 &msg->line_port, 1115 &msg->line_port,
@@ -1263,7 +1263,7 @@ handle_client_register_message (void *cls,
1263 }; 1263 };
1264 1264
1265 line->line_port = msg->line_port; 1265 line->line_port = msg->line_port;
1266 line->port = GNUNET_CADET_open_porT (cadet, 1266 line->port = GNUNET_CADET_open_port (cadet,
1267 &msg->line_port, 1267 &msg->line_port,
1268 &inbound_channel, 1268 &inbound_channel,
1269 line, 1269 line,
@@ -1306,7 +1306,7 @@ run (void *cls,
1306 GNUNET_assert (GNUNET_OK == 1306 GNUNET_assert (GNUNET_OK ==
1307 GNUNET_CRYPTO_get_peer_identity (cfg, 1307 GNUNET_CRYPTO_get_peer_identity (cfg,
1308 &my_identity)); 1308 &my_identity));
1309 cadet = GNUNET_CADET_connecT (cfg); 1309 cadet = GNUNET_CADET_connect (cfg);
1310 if (NULL == cadet) 1310 if (NULL == cadet)
1311 { 1311 {
1312 GNUNET_break (0); 1312 GNUNET_break (0);
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 09576e393..a32cb3086 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -2502,7 +2502,7 @@ store_service (int proto,
2502 GNUNET_h2s (&cadet_port), 2502 GNUNET_h2s (&cadet_port),
2503 name, 2503 name,
2504 (unsigned int) destination_port); 2504 (unsigned int) destination_port);
2505 service->port = GNUNET_CADET_open_porT (cadet_handle, 2505 service->port = GNUNET_CADET_open_port (cadet_handle,
2506 &cadet_port, 2506 &cadet_port,
2507 &new_service_channel, 2507 &new_service_channel,
2508 service, 2508 service,
@@ -3579,7 +3579,7 @@ advertise_dns_exit ()
3579 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3579 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
3580 "Opening CADET port %s for DNS exit service\n", 3580 "Opening CADET port %s for DNS exit service\n",
3581 GNUNET_h2s (&port)); 3581 GNUNET_h2s (&port));
3582 dns_port = GNUNET_CADET_open_porT (cadet_handle, 3582 dns_port = GNUNET_CADET_open_port (cadet_handle,
3583 &port, 3583 &port,
3584 &new_channel, 3584 &new_channel,
3585 NULL, 3585 NULL,
@@ -3829,7 +3829,7 @@ run (void *cls,
3829 NULL); 3829 NULL);
3830 stats = GNUNET_STATISTICS_create ("exit", 3830 stats = GNUNET_STATISTICS_create ("exit",
3831 cfg); 3831 cfg);
3832 cadet_handle = GNUNET_CADET_connecT (cfg); 3832 cadet_handle = GNUNET_CADET_connect (cfg);
3833 if (NULL == cadet_handle) 3833 if (NULL == cadet_handle)
3834 { 3834 {
3835 GNUNET_SCHEDULER_shutdown (); 3835 GNUNET_SCHEDULER_shutdown ();
@@ -3862,7 +3862,7 @@ run (void *cls,
3862 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3862 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
3863 "Opening CADET port %s for IPv4 gateway service\n", 3863 "Opening CADET port %s for IPv4 gateway service\n",
3864 GNUNET_h2s (&port)); 3864 GNUNET_h2s (&port));
3865 cadet_port4 = GNUNET_CADET_open_porT (cadet_handle, 3865 cadet_port4 = GNUNET_CADET_open_port (cadet_handle,
3866 &port, 3866 &port,
3867 &new_channel, 3867 &new_channel,
3868 NULL, 3868 NULL,
@@ -3902,7 +3902,7 @@ run (void *cls,
3902 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3902 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
3903 "Opening CADET port %s for IPv6 gateway service\n", 3903 "Opening CADET port %s for IPv6 gateway service\n",
3904 GNUNET_h2s (&port)); 3904 GNUNET_h2s (&port));
3905 cadet_port6 = GNUNET_CADET_open_porT (cadet_handle, 3905 cadet_port6 = GNUNET_CADET_open_port (cadet_handle,
3906 &port, 3906 &port,
3907 &new_channel, 3907 &new_channel,
3908 NULL, 3908 NULL,
diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c
index 55e0cbc24..c729ebe41 100644
--- a/src/fs/gnunet-service-fs_cadet_client.c
+++ b/src/fs/gnunet-service-fs_cadet_client.c
@@ -487,7 +487,7 @@ reset_cadet (struct CadetHandle *mh)
487 GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER, 487 GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER,
488 strlen (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER), 488 strlen (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER),
489 &port); 489 &port);
490 mh->channel = GNUNET_CADET_channel_creatE (cadet_handle, 490 mh->channel = GNUNET_CADET_channel_create (cadet_handle,
491 mh, 491 mh,
492 &mh->target, 492 &mh->target,
493 &port, 493 &port,
@@ -627,7 +627,7 @@ get_cadet (const struct GNUNET_PeerIdentity *target)
627 GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER, 627 GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER,
628 strlen (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER), 628 strlen (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER),
629 &port); 629 &port);
630 mh->channel = GNUNET_CADET_channel_creatE (cadet_handle, 630 mh->channel = GNUNET_CADET_channel_create (cadet_handle,
631 mh, 631 mh,
632 &mh->target, 632 &mh->target,
633 &port, 633 &port,
diff --git a/src/fs/gnunet-service-fs_cadet_server.c b/src/fs/gnunet-service-fs_cadet_server.c
index adbce1154..8567e63a2 100644
--- a/src/fs/gnunet-service-fs_cadet_server.c
+++ b/src/fs/gnunet-service-fs_cadet_server.c
@@ -499,12 +499,12 @@ GSF_cadet_start_server ()
499 "Initializing cadet FS server with a limit of %llu connections\n", 499 "Initializing cadet FS server with a limit of %llu connections\n",
500 sc_count_max); 500 sc_count_max);
501 cadet_map = GNUNET_CONTAINER_multipeermap_create (16, GNUNET_YES); 501 cadet_map = GNUNET_CONTAINER_multipeermap_create (16, GNUNET_YES);
502 cadet_handle = GNUNET_CADET_connecT (GSF_cfg); 502 cadet_handle = GNUNET_CADET_connect (GSF_cfg);
503 GNUNET_assert (NULL != cadet_handle); 503 GNUNET_assert (NULL != cadet_handle);
504 GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER, 504 GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER,
505 strlen (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER), 505 strlen (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER),
506 &port); 506 &port);
507 cadet_port = GNUNET_CADET_open_porT (cadet_handle, 507 cadet_port = GNUNET_CADET_open_port (cadet_handle,
508 &port, 508 &port,
509 &connect_cb, 509 &connect_cb,
510 NULL, 510 NULL,
diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h
index 8d3d4326b..f76f17a51 100644
--- a/src/include/gnunet_cadet_service.h
+++ b/src/include/gnunet_cadet_service.h
@@ -1,6 +1,6 @@
1/* 1/*
2 This file is part of GNUnet. 2 This file is part of GNUnet.
3 Copyright (C) 2009-2014 GNUnet e.V. 3 Copyright (C) 2009-2017 GNUnet e.V.
4 4
5 GNUnet is free software; you can redistribute it and/or modify 5 GNUnet is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published 6 it under the terms of the GNU General Public License as published
@@ -137,12 +137,12 @@ enum GNUNET_CADET_ChannelOption
137/** 137/**
138 * Method called whenever a peer connects to a port in MQ-based CADET. 138 * Method called whenever a peer connects to a port in MQ-based CADET.
139 * 139 *
140 * @param cls Closure from #GNUNET_CADET_open_porT. 140 * @param cls Closure from #GNUNET_CADET_open_port.
141 * @param channel New handle to the channel. 141 * @param channel New handle to the channel.
142 * @param source Peer that started this channel. 142 * @param source Peer that started this channel.
143 * @return Closure for the incoming @a channel. It's given to: 143 * @return Closure for the incoming @a channel. It's given to:
144 * - The #GNUNET_CADET_DisconnectEventHandler (given to 144 * - The #GNUNET_CADET_DisconnectEventHandler (given to
145 * #GNUNET_CADET_open_porT) when the channel dies. 145 * #GNUNET_CADET_open_port) when the channel dies.
146 * - Each the #GNUNET_MQ_MessageCallback handlers for each message 146 * - Each the #GNUNET_MQ_MessageCallback handlers for each message
147 * received on the @a channel. 147 * received on the @a channel.
148 */ 148 */
@@ -195,7 +195,7 @@ typedef void
195 * @return Handle to the cadet service NULL on error. 195 * @return Handle to the cadet service NULL on error.
196 */ 196 */
197struct GNUNET_CADET_Handle * 197struct GNUNET_CADET_Handle *
198GNUNET_CADET_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg); 198GNUNET_CADET_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
199 199
200 200
201/** 201/**
@@ -224,7 +224,7 @@ GNUNET_CADET_disconnect (struct GNUNET_CADET_Handle *handle);
224 * @return Port handle. 224 * @return Port handle.
225 */ 225 */
226struct GNUNET_CADET_Port * 226struct GNUNET_CADET_Port *
227GNUNET_CADET_open_porT (struct GNUNET_CADET_Handle *h, 227GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h,
228 const struct GNUNET_HashCode *port, 228 const struct GNUNET_HashCode *port,
229 GNUNET_CADET_ConnectEventHandler connects, 229 GNUNET_CADET_ConnectEventHandler connects,
230 void *connects_cls, 230 void *connects_cls,
@@ -266,7 +266,7 @@ GNUNET_CADET_close_port (struct GNUNET_CADET_Port *p);
266 * @return Handle to the channel. 266 * @return Handle to the channel.
267 */ 267 */
268struct GNUNET_CADET_Channel * 268struct GNUNET_CADET_Channel *
269GNUNET_CADET_channel_creatE (struct GNUNET_CADET_Handle *h, 269GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h,
270 void *channel_cls, 270 void *channel_cls,
271 const struct GNUNET_PeerIdentity *destination, 271 const struct GNUNET_PeerIdentity *destination,
272 const struct GNUNET_HashCode *port, 272 const struct GNUNET_HashCode *port,
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)
1299 GNUNET_MQ_handler_end () 1299 GNUNET_MQ_handler_end ()
1300 }; 1300 };
1301 1301
1302 chn->channel = GNUNET_CADET_channel_creatE (cadet, chn, &chn->peer, 1302 chn->channel = GNUNET_CADET_channel_create (cadet, chn, &chn->peer,
1303 &grp->cadet_port_hash, 1303 &grp->cadet_port_hash,
1304 GNUNET_CADET_OPTION_RELIABLE, 1304 GNUNET_CADET_OPTION_RELIABLE,
1305 cadet_notify_window_change, 1305 cadet_notify_window_change,
@@ -1389,7 +1389,7 @@ handle_client_origin_start (void *cls,
1389 }; 1389 };
1390 1390
1391 1391
1392 orig->cadet_port = GNUNET_CADET_open_porT (cadet, 1392 orig->cadet_port = GNUNET_CADET_open_port (cadet,
1393 &grp->cadet_port_hash, 1393 &grp->cadet_port_hash,
1394 cadet_notify_connect, 1394 cadet_notify_connect,
1395 NULL, 1395 NULL,
@@ -2082,7 +2082,7 @@ run (void *cls,
2082 replay_req_cadet = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); 2082 replay_req_cadet = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
2083 replay_req_client = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); 2083 replay_req_client = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
2084 2084
2085 cadet = GNUNET_CADET_connecT (cfg); 2085 cadet = GNUNET_CADET_connect (cfg);
2086 2086
2087 GNUNET_assert (NULL != cadet); 2087 GNUNET_assert (NULL != cadet);
2088 2088
diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c
index 9bd1fb16b..295082c0e 100644
--- a/src/pt/gnunet-daemon-pt.c
+++ b/src/pt/gnunet-daemon-pt.c
@@ -1084,7 +1084,7 @@ try_open_exit ()
1084 1084
1085 /* move to the head of the DLL */ 1085 /* move to the head of the DLL */
1086 pos->cadet_channel 1086 pos->cadet_channel
1087 = GNUNET_CADET_channel_creatE (cadet_handle, 1087 = GNUNET_CADET_channel_create (cadet_handle,
1088 pos, 1088 pos,
1089 &pos->peer, 1089 &pos->peer,
1090 &port, 1090 &port,
@@ -1246,7 +1246,7 @@ run (void *cls, char *const *args GNUNET_UNUSED,
1246 GNUNET_SCHEDULER_shutdown (); 1246 GNUNET_SCHEDULER_shutdown ();
1247 return; 1247 return;
1248 } 1248 }
1249 cadet_handle = GNUNET_CADET_connecT (cfg); 1249 cadet_handle = GNUNET_CADET_connect (cfg);
1250 if (NULL == cadet_handle) 1250 if (NULL == cadet_handle)
1251 { 1251 {
1252 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 1252 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 443b50215..4a2f96123 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -2349,12 +2349,12 @@ run (void *cls,
2349 2349
2350 2350
2351 /* Initialise cadet */ 2351 /* Initialise cadet */
2352 cadet_handle = GNUNET_CADET_connecT (cfg); 2352 cadet_handle = GNUNET_CADET_connect (cfg);
2353 GNUNET_assert (NULL != cadet_handle); 2353 GNUNET_assert (NULL != cadet_handle);
2354 GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_RPS, 2354 GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_RPS,
2355 strlen (GNUNET_APPLICATION_PORT_RPS), 2355 strlen (GNUNET_APPLICATION_PORT_RPS),
2356 &port); 2356 &port);
2357 cadet_port = GNUNET_CADET_open_porT (cadet_handle, 2357 cadet_port = GNUNET_CADET_open_port (cadet_handle,
2358 &port, 2358 &port,
2359 &Peers_handle_inbound_channel, /* Connect handler */ 2359 &Peers_handle_inbound_channel, /* Connect handler */
2360 NULL, /* cls */ 2360 NULL, /* cls */
diff --git a/src/rps/gnunet-service-rps_peers.c b/src/rps/gnunet-service-rps_peers.c
index 698c1528e..58aa84ccf 100644
--- a/src/rps/gnunet-service-rps_peers.c
+++ b/src/rps/gnunet-service-rps_peers.c
@@ -533,7 +533,7 @@ get_channel (const struct GNUNET_PeerIdentity *peer)
533 strlen (GNUNET_APPLICATION_PORT_RPS), 533 strlen (GNUNET_APPLICATION_PORT_RPS),
534 &port); 534 &port);
535 peer_ctx->send_channel = 535 peer_ctx->send_channel =
536 GNUNET_CADET_channel_creatE (cadet_handle, 536 GNUNET_CADET_channel_create (cadet_handle,
537 (struct GNUNET_PeerIdentity *) peer, /* context */ 537 (struct GNUNET_PeerIdentity *) peer, /* context */
538 peer, 538 peer,
539 &port, 539 &port,
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
index ca92fb9ea..c0b33f8ef 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
@@ -842,7 +842,7 @@ client_request_complete_alice (struct AliceServiceSession *s)
842 "Creating new channel for session with key %s.\n", 842 "Creating new channel for session with key %s.\n",
843 GNUNET_h2s (&s->session_id)); 843 GNUNET_h2s (&s->session_id));
844 s->channel 844 s->channel
845 = GNUNET_CADET_channel_creatE (my_cadet, 845 = GNUNET_CADET_channel_create (my_cadet,
846 s, 846 s,
847 &s->peer, 847 &s->peer,
848 &s->session_id, 848 &s->session_id,
@@ -1173,7 +1173,7 @@ run (void *cls,
1173 GNUNET_CRYPTO_ecc_rnd_mpi (edc, 1173 GNUNET_CRYPTO_ecc_rnd_mpi (edc,
1174 &my_privkey, 1174 &my_privkey,
1175 &my_privkey_inv); 1175 &my_privkey_inv);
1176 my_cadet = GNUNET_CADET_connecT (cfg); 1176 my_cadet = GNUNET_CADET_connect (cfg);
1177 if (NULL == my_cadet) 1177 if (NULL == my_cadet)
1178 { 1178 {
1179 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 1179 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
index 3851ca763..0b0333332 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
@@ -950,7 +950,7 @@ handle_bob_client_message (void *cls,
950 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 950 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
951 "Received client request, opening port %s!\n", 951 "Received client request, opening port %s!\n",
952 GNUNET_h2s (&msg->session_key)); 952 GNUNET_h2s (&msg->session_key));
953 s->port = GNUNET_CADET_open_porT (my_cadet, 953 s->port = GNUNET_CADET_open_port (my_cadet,
954 &msg->session_key, 954 &msg->session_key,
955 &cb_channel_incoming, 955 &cb_channel_incoming,
956 s, 956 s,
@@ -1054,7 +1054,7 @@ run (void *cls,
1054 /* We don't really do DLOG, so we can setup with very minimal resources */ 1054 /* We don't really do DLOG, so we can setup with very minimal resources */
1055 edc = GNUNET_CRYPTO_ecc_dlog_prepare (4 /* max value */, 1055 edc = GNUNET_CRYPTO_ecc_dlog_prepare (4 /* max value */,
1056 2 /* RAM */); 1056 2 /* RAM */);
1057 my_cadet = GNUNET_CADET_connecT (cfg); 1057 my_cadet = GNUNET_CADET_connect (cfg);
1058 GNUNET_SCHEDULER_add_shutdown (&shutdown_task, 1058 GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
1059 NULL); 1059 NULL);
1060 if (NULL == my_cadet) 1060 if (NULL == my_cadet)
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
index 6d7a0a3b8..a55d03900 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
@@ -1076,7 +1076,7 @@ client_request_complete_alice (struct AliceServiceSession *s)
1076 "Creating new channel for session with key %s.\n", 1076 "Creating new channel for session with key %s.\n",
1077 GNUNET_h2s (&s->session_id)); 1077 GNUNET_h2s (&s->session_id));
1078 s->channel 1078 s->channel
1079 = GNUNET_CADET_channel_creatE (my_cadet, 1079 = GNUNET_CADET_channel_create (my_cadet,
1080 s, 1080 s,
1081 &s->peer, 1081 &s->peer,
1082 &s->session_id, 1082 &s->session_id,
@@ -1398,7 +1398,7 @@ run (void *cls,
1398 GNUNET_CRYPTO_PAILLIER_BITS / 3); 1398 GNUNET_CRYPTO_PAILLIER_BITS / 3);
1399 GNUNET_CRYPTO_paillier_create (&my_pubkey, 1399 GNUNET_CRYPTO_paillier_create (&my_pubkey,
1400 &my_privkey); 1400 &my_privkey);
1401 my_cadet = GNUNET_CADET_connecT (cfg); 1401 my_cadet = GNUNET_CADET_connect (cfg);
1402 GNUNET_SCHEDULER_add_shutdown (&shutdown_task, 1402 GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
1403 NULL); 1403 NULL);
1404 if (NULL == my_cadet) 1404 if (NULL == my_cadet)
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c b/src/scalarproduct/gnunet-service-scalarproduct_bob.c
index f3b5327f1..0c38cb426 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c
@@ -1230,7 +1230,7 @@ handle_bob_client_message (void *cls,
1230 } 1230 }
1231 GNUNET_SERVICE_client_continue (s->client); 1231 GNUNET_SERVICE_client_continue (s->client);
1232 /* We're ready, open the port */ 1232 /* We're ready, open the port */
1233 s->port = GNUNET_CADET_open_porT (my_cadet, 1233 s->port = GNUNET_CADET_open_port (my_cadet,
1234 &msg->session_key, 1234 &msg->session_key,
1235 &cb_channel_incoming, 1235 &cb_channel_incoming,
1236 s, 1236 s,
@@ -1336,7 +1336,7 @@ run (void *cls,
1336 1336
1337 GNUNET_CRYPTO_paillier_create (&my_pubkey, 1337 GNUNET_CRYPTO_paillier_create (&my_pubkey,
1338 &my_privkey); 1338 &my_privkey);
1339 my_cadet = GNUNET_CADET_connecT (cfg); 1339 my_cadet = GNUNET_CADET_connect (cfg);
1340 GNUNET_SCHEDULER_add_shutdown (&shutdown_task, 1340 GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
1341 NULL); 1341 NULL);
1342 if (NULL == my_cadet) 1342 if (NULL == my_cadet)
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 752253411..12af653c1 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -1305,7 +1305,7 @@ handle_client_listen (void *cls,
1305 listener->operation, 1305 listener->operation,
1306 GNUNET_h2s (&listener->app_id)); 1306 GNUNET_h2s (&listener->app_id));
1307 listener->open_port 1307 listener->open_port
1308 = GNUNET_CADET_open_porT (cadet, 1308 = GNUNET_CADET_open_port (cadet,
1309 &msg->app_id, 1309 &msg->app_id,
1310 &channel_new_cb, 1310 &channel_new_cb,
1311 listener, 1311 listener,
@@ -1568,7 +1568,7 @@ handle_client_evaluate (void *cls,
1568 "Creating new CADET channel to port %s for set operation type %u\n", 1568 "Creating new CADET channel to port %s for set operation type %u\n",
1569 GNUNET_h2s (&msg->app_id), 1569 GNUNET_h2s (&msg->app_id),
1570 set->operation); 1570 set->operation);
1571 op->channel = GNUNET_CADET_channel_creatE (cadet, 1571 op->channel = GNUNET_CADET_channel_create (cadet,
1572 op, 1572 op,
1573 &msg->target_peer, 1573 &msg->target_peer,
1574 &msg->app_id, 1574 &msg->app_id,
@@ -1941,7 +1941,7 @@ run (void *cls,
1941 NULL); 1941 NULL);
1942 _GSS_statistics = GNUNET_STATISTICS_create ("set", 1942 _GSS_statistics = GNUNET_STATISTICS_create ("set",
1943 cfg); 1943 cfg);
1944 cadet = GNUNET_CADET_connecT (cfg); 1944 cadet = GNUNET_CADET_connect (cfg);
1945 if (NULL == cadet) 1945 if (NULL == cadet)
1946 { 1946 {
1947 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 1947 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index aab0a143f..ab0b00d76 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -1384,7 +1384,7 @@ create_channel (struct ChannelState *ts,
1384 GNUNET_MQ_handler_end() 1384 GNUNET_MQ_handler_end()
1385 }; 1385 };
1386 1386
1387 return GNUNET_CADET_channel_creatE (cadet_handle, 1387 return GNUNET_CADET_channel_create (cadet_handle,
1388 ts, 1388 ts,
1389 target, 1389 target,
1390 port, 1390 port,
@@ -3068,7 +3068,7 @@ run (void *cls,
3068 } 3068 }
3069 vpn_argv[6] = NULL; 3069 vpn_argv[6] = NULL;
3070 3070
3071 cadet_handle = GNUNET_CADET_connecT (cfg_); 3071 cadet_handle = GNUNET_CADET_connect (cfg_);
3072 // FIXME never opens ports??? 3072 // FIXME never opens ports???
3073 helper_handle = GNUNET_HELPER_start (GNUNET_NO, 3073 helper_handle = GNUNET_HELPER_start (GNUNET_NO,
3074 "gnunet-helper-vpn", vpn_argv, 3074 "gnunet-helper-vpn", vpn_argv,