aboutsummaryrefslogtreecommitdiff
path: root/src/cadet
diff options
context:
space:
mode:
Diffstat (limited to 'src/cadet')
-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
5 files changed, 18 insertions, 18 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 */