From e4186e9327787fe463ab4571186672888df09e39 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 13 Mar 2017 01:46:55 +0100 Subject: renaming CADET APIs to match naming conventions again, now that the old symbols have been purged --- src/cadet/cadet_api.c | 8 ++++---- src/cadet/cadet_test_lib.c | 4 ++-- src/cadet/gnunet-cadet.c | 6 +++--- src/cadet/test_cadet.c | 6 +++--- src/cadet/test_cadet_local_mq.c | 12 ++++++------ src/conversation/gnunet-service-conversation.c | 6 +++--- src/exit/gnunet-daemon-exit.c | 10 +++++----- src/fs/gnunet-service-fs_cadet_client.c | 4 ++-- src/fs/gnunet-service-fs_cadet_server.c | 4 ++-- src/include/gnunet_cadet_service.h | 12 ++++++------ src/multicast/gnunet-service-multicast.c | 6 +++--- src/pt/gnunet-daemon-pt.c | 4 ++-- src/rps/gnunet-service-rps.c | 4 ++-- src/rps/gnunet-service-rps_peers.c | 2 +- src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c | 4 ++-- src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c | 4 ++-- src/scalarproduct/gnunet-service-scalarproduct_alice.c | 4 ++-- src/scalarproduct/gnunet-service-scalarproduct_bob.c | 4 ++-- src/set/gnunet-service-set.c | 6 +++--- src/vpn/gnunet-service-vpn.c | 4 ++-- 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) * @return Handle to the cadet service NULL on error. */ struct GNUNET_CADET_Handle * -GNUNET_CADET_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg) +GNUNET_CADET_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) { struct GNUNET_CADET_Handle *h; LOG (GNUNET_ERROR_TYPE_DEBUG, - "GNUNET_CADET_connecT()\n"); + "GNUNET_CADET_connect()\n"); h = GNUNET_new (struct GNUNET_CADET_Handle); h->cfg = cfg; h->ports = GNUNET_CONTAINER_multihashmap_create (4, @@ -1586,7 +1586,7 @@ GNUNET_CADET_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg) * @return Port handle. */ struct GNUNET_CADET_Port * -GNUNET_CADET_open_porT (struct GNUNET_CADET_Handle *h, +GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h, const struct GNUNET_HashCode *port, GNUNET_CADET_ConnectEventHandler connects, void * connects_cls, @@ -1645,7 +1645,7 @@ GNUNET_CADET_open_porT (struct GNUNET_CADET_Handle *h, * @return Handle to the channel. */ struct GNUNET_CADET_Channel * -GNUNET_CADET_channel_creatE (struct GNUNET_CADET_Handle *h, +GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h, void *channel_cls, const struct GNUNET_PeerIdentity *destination, 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, struct GNUNET_CADET_Handle *h; unsigned int i; - h = GNUNET_CADET_connecT (cfg); + h = GNUNET_CADET_connect (cfg); if (NULL == ctx->ports) return h; actx->ports = GNUNET_new_array (ctx->port_count, struct GNUNET_CADET_Port *); for (i = 0; i < ctx->port_count; i++) { - actx->ports[i] = GNUNET_CADET_open_porT (h, + actx->ports[i] = GNUNET_CADET_open_port (h, ctx->ports[i], ctx->connects, (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, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CADET service\n"); - mh = GNUNET_CADET_connecT (cfg); + mh = GNUNET_CADET_connect (cfg); GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); if (NULL == mh) @@ -844,7 +844,7 @@ run (void *cls, GNUNET_CRYPTO_hash (listen_port, strlen (listen_port), &porthash); - lp = GNUNET_CADET_open_porT (mh, + lp = GNUNET_CADET_open_port (mh, &porthash, &channel_incoming, NULL, @@ -876,7 +876,7 @@ run (void *cls, GNUNET_CRYPTO_hash (target_port, strlen(target_port), &porthash); - ch = GNUNET_CADET_channel_creatE (mh, + ch = GNUNET_CADET_channel_create (mh, NULL, &pid, &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) /** * Method called whenever a peer connects to a port in MQ-based CADET. * - * @param cls Closure from #GNUNET_CADET_open_porT (peer # as long). + * @param cls Closure from #GNUNET_CADET_open_port (peer # as long). * @param channel New handle to the channel. * @param source Peer that started this channel. * @return Closure for the incoming @a channel. It's given to: * - The #GNUNET_CADET_DisconnectEventHandler (given to - * #GNUNET_CADET_open_porT) when the channel dies. + * #GNUNET_CADET_open_port) when the channel dies. * - Each the #GNUNET_MQ_MessageCallback handlers for each message * received on the @a channel. */ @@ -840,7 +840,7 @@ start_test (void *cls) } ch = GNUNET_new (struct CadetTestChannelWrapper); - outgoing_ch = GNUNET_CADET_channel_creatE (h1, + outgoing_ch = GNUNET_CADET_channel_create (h1, ch, p_id[1], &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) /** * Method called whenever a peer connects to a port in MQ-based CADET. * - * @param cls Closure from #GNUNET_CADET_open_porT. + * @param cls Closure from #GNUNET_CADET_open_port. * @param channel New handle to the channel. * @param source Peer that started this channel. * @return Closure for the incoming @a channel. It's given to: * - The #GNUNET_CADET_DisconnectEventHandler (given to - * #GNUNET_CADET_open_porT) when the channel dies. + * #GNUNET_CADET_open_port) when the channel dies. * - Each the #GNUNET_MQ_MessageCallback handlers for each message * received on the @a channel. */ @@ -235,7 +235,7 @@ do_connect (void *cls) GNUNET_TESTING_peer_get_identity (me, &id); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "creating channel\n"); - ch = GNUNET_CADET_channel_creatE (cadet_peer_1, /* cadet handle */ + ch = GNUNET_CADET_channel_create (cadet_peer_1, /* cadet handle */ NULL, /* channel cls */ &id, /* destination */ GC_u2h (TEST_MESSAGE_TYPE), /* port */ @@ -282,8 +282,8 @@ run (void *cls, abort_task = GNUNET_SCHEDULER_add_delayed (delay, &do_abort, (void *) (long) __LINE__); - cadet_peer_1 = GNUNET_CADET_connecT (cfg); - cadet_peer_2 = GNUNET_CADET_connecT (cfg); + cadet_peer_1 = GNUNET_CADET_connect (cfg); + cadet_peer_2 = GNUNET_CADET_connect (cfg); if ( (NULL == cadet_peer_1) || (NULL == cadet_peer_2) ) @@ -297,7 +297,7 @@ run (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CADET 1: %p\n", cadet_peer_1); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CADET 2: %p\n", cadet_peer_2); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handlers 2: %p\n", handlers); - GNUNET_CADET_open_porT (cadet_peer_2, /* cadet handle */ + GNUNET_CADET_open_port (cadet_peer_2, /* cadet handle */ GC_u2h (TEST_PORT_ID), /* port id */ &connected, /* connect handler */ (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, line->channel_tail, ch); ch->status = CS_CALLER_CALLING; - ch->channel = GNUNET_CADET_channel_creatE (cadet, + ch->channel = GNUNET_CADET_channel_create (cadet, ch, &msg->target, &msg->line_port, @@ -1263,7 +1263,7 @@ handle_client_register_message (void *cls, }; line->line_port = msg->line_port; - line->port = GNUNET_CADET_open_porT (cadet, + line->port = GNUNET_CADET_open_port (cadet, &msg->line_port, &inbound_channel, line, @@ -1306,7 +1306,7 @@ run (void *cls, GNUNET_assert (GNUNET_OK == GNUNET_CRYPTO_get_peer_identity (cfg, &my_identity)); - cadet = GNUNET_CADET_connecT (cfg); + cadet = GNUNET_CADET_connect (cfg); if (NULL == cadet) { 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, GNUNET_h2s (&cadet_port), name, (unsigned int) destination_port); - service->port = GNUNET_CADET_open_porT (cadet_handle, + service->port = GNUNET_CADET_open_port (cadet_handle, &cadet_port, &new_service_channel, service, @@ -3579,7 +3579,7 @@ advertise_dns_exit () GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Opening CADET port %s for DNS exit service\n", GNUNET_h2s (&port)); - dns_port = GNUNET_CADET_open_porT (cadet_handle, + dns_port = GNUNET_CADET_open_port (cadet_handle, &port, &new_channel, NULL, @@ -3829,7 +3829,7 @@ run (void *cls, NULL); stats = GNUNET_STATISTICS_create ("exit", cfg); - cadet_handle = GNUNET_CADET_connecT (cfg); + cadet_handle = GNUNET_CADET_connect (cfg); if (NULL == cadet_handle) { GNUNET_SCHEDULER_shutdown (); @@ -3862,7 +3862,7 @@ run (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Opening CADET port %s for IPv4 gateway service\n", GNUNET_h2s (&port)); - cadet_port4 = GNUNET_CADET_open_porT (cadet_handle, + cadet_port4 = GNUNET_CADET_open_port (cadet_handle, &port, &new_channel, NULL, @@ -3902,7 +3902,7 @@ run (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Opening CADET port %s for IPv6 gateway service\n", GNUNET_h2s (&port)); - cadet_port6 = GNUNET_CADET_open_porT (cadet_handle, + cadet_port6 = GNUNET_CADET_open_port (cadet_handle, &port, &new_channel, 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) GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER, strlen (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER), &port); - mh->channel = GNUNET_CADET_channel_creatE (cadet_handle, + mh->channel = GNUNET_CADET_channel_create (cadet_handle, mh, &mh->target, &port, @@ -627,7 +627,7 @@ get_cadet (const struct GNUNET_PeerIdentity *target) GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER, strlen (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER), &port); - mh->channel = GNUNET_CADET_channel_creatE (cadet_handle, + mh->channel = GNUNET_CADET_channel_create (cadet_handle, mh, &mh->target, &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 () "Initializing cadet FS server with a limit of %llu connections\n", sc_count_max); cadet_map = GNUNET_CONTAINER_multipeermap_create (16, GNUNET_YES); - cadet_handle = GNUNET_CADET_connecT (GSF_cfg); + cadet_handle = GNUNET_CADET_connect (GSF_cfg); GNUNET_assert (NULL != cadet_handle); GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER, strlen (GNUNET_APPLICATION_PORT_FS_BLOCK_TRANSFER), &port); - cadet_port = GNUNET_CADET_open_porT (cadet_handle, + cadet_port = GNUNET_CADET_open_port (cadet_handle, &port, &connect_cb, 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 @@ /* This file is part of GNUnet. - Copyright (C) 2009-2014 GNUnet e.V. + Copyright (C) 2009-2017 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -137,12 +137,12 @@ enum GNUNET_CADET_ChannelOption /** * Method called whenever a peer connects to a port in MQ-based CADET. * - * @param cls Closure from #GNUNET_CADET_open_porT. + * @param cls Closure from #GNUNET_CADET_open_port. * @param channel New handle to the channel. * @param source Peer that started this channel. * @return Closure for the incoming @a channel. It's given to: * - The #GNUNET_CADET_DisconnectEventHandler (given to - * #GNUNET_CADET_open_porT) when the channel dies. + * #GNUNET_CADET_open_port) when the channel dies. * - Each the #GNUNET_MQ_MessageCallback handlers for each message * received on the @a channel. */ @@ -195,7 +195,7 @@ typedef void * @return Handle to the cadet service NULL on error. */ struct GNUNET_CADET_Handle * -GNUNET_CADET_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg); +GNUNET_CADET_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); /** @@ -224,7 +224,7 @@ GNUNET_CADET_disconnect (struct GNUNET_CADET_Handle *handle); * @return Port handle. */ struct GNUNET_CADET_Port * -GNUNET_CADET_open_porT (struct GNUNET_CADET_Handle *h, +GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h, const struct GNUNET_HashCode *port, GNUNET_CADET_ConnectEventHandler connects, void *connects_cls, @@ -266,7 +266,7 @@ GNUNET_CADET_close_port (struct GNUNET_CADET_Port *p); * @return Handle to the channel. */ struct GNUNET_CADET_Channel * -GNUNET_CADET_channel_creatE (struct GNUNET_CADET_Handle *h, +GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h, void *channel_cls, const struct GNUNET_PeerIdentity *destination, 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) 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); 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 () /* move to the head of the DLL */ pos->cadet_channel - = GNUNET_CADET_channel_creatE (cadet_handle, + = GNUNET_CADET_channel_create (cadet_handle, pos, &pos->peer, &port, @@ -1246,7 +1246,7 @@ run (void *cls, char *const *args GNUNET_UNUSED, GNUNET_SCHEDULER_shutdown (); return; } - cadet_handle = GNUNET_CADET_connecT (cfg); + cadet_handle = GNUNET_CADET_connect (cfg); if (NULL == cadet_handle) { 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, /* Initialise cadet */ - cadet_handle = GNUNET_CADET_connecT (cfg); + cadet_handle = GNUNET_CADET_connect (cfg); GNUNET_assert (NULL != cadet_handle); GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_RPS, strlen (GNUNET_APPLICATION_PORT_RPS), &port); - cadet_port = GNUNET_CADET_open_porT (cadet_handle, + cadet_port = GNUNET_CADET_open_port (cadet_handle, &port, &Peers_handle_inbound_channel, /* Connect handler */ 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) strlen (GNUNET_APPLICATION_PORT_RPS), &port); peer_ctx->send_channel = - GNUNET_CADET_channel_creatE (cadet_handle, + GNUNET_CADET_channel_create (cadet_handle, (struct GNUNET_PeerIdentity *) peer, /* context */ peer, &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) "Creating new channel for session with key %s.\n", GNUNET_h2s (&s->session_id)); s->channel - = GNUNET_CADET_channel_creatE (my_cadet, + = GNUNET_CADET_channel_create (my_cadet, s, &s->peer, &s->session_id, @@ -1173,7 +1173,7 @@ run (void *cls, GNUNET_CRYPTO_ecc_rnd_mpi (edc, &my_privkey, &my_privkey_inv); - my_cadet = GNUNET_CADET_connecT (cfg); + my_cadet = GNUNET_CADET_connect (cfg); if (NULL == my_cadet) { 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, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received client request, opening port %s!\n", GNUNET_h2s (&msg->session_key)); - s->port = GNUNET_CADET_open_porT (my_cadet, + s->port = GNUNET_CADET_open_port (my_cadet, &msg->session_key, &cb_channel_incoming, s, @@ -1054,7 +1054,7 @@ run (void *cls, /* We don't really do DLOG, so we can setup with very minimal resources */ edc = GNUNET_CRYPTO_ecc_dlog_prepare (4 /* max value */, 2 /* RAM */); - my_cadet = GNUNET_CADET_connecT (cfg); + my_cadet = GNUNET_CADET_connect (cfg); GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); 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) "Creating new channel for session with key %s.\n", GNUNET_h2s (&s->session_id)); s->channel - = GNUNET_CADET_channel_creatE (my_cadet, + = GNUNET_CADET_channel_create (my_cadet, s, &s->peer, &s->session_id, @@ -1398,7 +1398,7 @@ run (void *cls, GNUNET_CRYPTO_PAILLIER_BITS / 3); GNUNET_CRYPTO_paillier_create (&my_pubkey, &my_privkey); - my_cadet = GNUNET_CADET_connecT (cfg); + my_cadet = GNUNET_CADET_connect (cfg); GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); 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, } GNUNET_SERVICE_client_continue (s->client); /* We're ready, open the port */ - s->port = GNUNET_CADET_open_porT (my_cadet, + s->port = GNUNET_CADET_open_port (my_cadet, &msg->session_key, &cb_channel_incoming, s, @@ -1336,7 +1336,7 @@ run (void *cls, GNUNET_CRYPTO_paillier_create (&my_pubkey, &my_privkey); - my_cadet = GNUNET_CADET_connecT (cfg); + my_cadet = GNUNET_CADET_connect (cfg); GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); 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, listener->operation, GNUNET_h2s (&listener->app_id)); listener->open_port - = GNUNET_CADET_open_porT (cadet, + = GNUNET_CADET_open_port (cadet, &msg->app_id, &channel_new_cb, listener, @@ -1568,7 +1568,7 @@ handle_client_evaluate (void *cls, "Creating new CADET channel to port %s for set operation type %u\n", GNUNET_h2s (&msg->app_id), set->operation); - op->channel = GNUNET_CADET_channel_creatE (cadet, + op->channel = GNUNET_CADET_channel_create (cadet, op, &msg->target_peer, &msg->app_id, @@ -1941,7 +1941,7 @@ run (void *cls, NULL); _GSS_statistics = GNUNET_STATISTICS_create ("set", cfg); - cadet = GNUNET_CADET_connecT (cfg); + cadet = GNUNET_CADET_connect (cfg); if (NULL == cadet) { 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, GNUNET_MQ_handler_end() }; - return GNUNET_CADET_channel_creatE (cadet_handle, + return GNUNET_CADET_channel_create (cadet_handle, ts, target, port, @@ -3068,7 +3068,7 @@ run (void *cls, } vpn_argv[6] = NULL; - cadet_handle = GNUNET_CADET_connecT (cfg_); + cadet_handle = GNUNET_CADET_connect (cfg_); // FIXME never opens ports??? helper_handle = GNUNET_HELPER_start (GNUNET_NO, "gnunet-helper-vpn", vpn_argv, -- cgit v1.2.3