diff options
Diffstat (limited to 'src')
94 files changed, 156 insertions, 156 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 2967e62b7..a61343833 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c | |||
@@ -474,7 +474,7 @@ reconnect_arm (struct GNUNET_ARM_Handle *h) | |||
474 | if (NULL != h->mq) | 474 | if (NULL != h->mq) |
475 | return GNUNET_OK; | 475 | return GNUNET_OK; |
476 | GNUNET_assert (GNUNET_NO == h->currently_up); | 476 | GNUNET_assert (GNUNET_NO == h->currently_up); |
477 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 477 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
478 | "arm", | 478 | "arm", |
479 | handlers, | 479 | handlers, |
480 | &mq_error_handler, | 480 | &mq_error_handler, |
diff --git a/src/arm/arm_monitor_api.c b/src/arm/arm_monitor_api.c index 471393c7e..b4dc6cb6a 100644 --- a/src/arm/arm_monitor_api.c +++ b/src/arm/arm_monitor_api.c | |||
@@ -209,7 +209,7 @@ reconnect_arm_monitor (struct GNUNET_ARM_MonitorHandle *h) | |||
209 | struct GNUNET_MQ_Envelope *env; | 209 | struct GNUNET_MQ_Envelope *env; |
210 | 210 | ||
211 | GNUNET_assert (NULL == h->mq); | 211 | GNUNET_assert (NULL == h->mq); |
212 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 212 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
213 | "arm", | 213 | "arm", |
214 | handlers, | 214 | handlers, |
215 | &mq_error_handler, | 215 | &mq_error_handler, |
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c index ab47ff635..0905f145d 100644 --- a/src/arm/test_exponential_backoff.c +++ b/src/arm/test_exponential_backoff.c | |||
@@ -151,7 +151,7 @@ kill_task (void *cbData) | |||
151 | GNUNET_free (shutdown_ctx); | 151 | GNUNET_free (shutdown_ctx); |
152 | return; | 152 | return; |
153 | } | 153 | } |
154 | shutdown_ctx->mq = GNUNET_CLIENT_connecT (cfg, | 154 | shutdown_ctx->mq = GNUNET_CLIENT_connect (cfg, |
155 | SERVICE, | 155 | SERVICE, |
156 | handlers, | 156 | handlers, |
157 | &mq_error_handler, | 157 | &mq_error_handler, |
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index 1bcef5806..326d3bdd4 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c | |||
@@ -384,7 +384,7 @@ core_connect_adapter (void *cls, | |||
384 | GNUNET_MQ_handler_end () | 384 | GNUNET_MQ_handler_end () |
385 | }; | 385 | }; |
386 | 386 | ||
387 | me->ch = GNUNET_CORE_connecT (cfg, | 387 | me->ch = GNUNET_CORE_connect (cfg, |
388 | me, | 388 | me, |
389 | NULL, | 389 | NULL, |
390 | &comm_connect_cb, | 390 | &comm_connect_cb, |
@@ -403,7 +403,7 @@ core_disconnect_adapter (void *cls, | |||
403 | { | 403 | { |
404 | struct BenchmarkPeer *me = cls; | 404 | struct BenchmarkPeer *me = cls; |
405 | 405 | ||
406 | GNUNET_CORE_disconnecT (me->ch); | 406 | GNUNET_CORE_disconnect (me->ch); |
407 | me->ch = NULL; | 407 | me->ch = NULL; |
408 | } | 408 | } |
409 | 409 | ||
diff --git a/src/ats/ats_api_connectivity.c b/src/ats/ats_api_connectivity.c index 241e5f93c..d551aacd4 100644 --- a/src/ats/ats_api_connectivity.c +++ b/src/ats/ats_api_connectivity.c | |||
@@ -195,7 +195,7 @@ reconnect (struct GNUNET_ATS_ConnectivityHandle *ch) | |||
195 | struct ClientStartMessage *init; | 195 | struct ClientStartMessage *init; |
196 | 196 | ||
197 | GNUNET_assert (NULL == ch->mq); | 197 | GNUNET_assert (NULL == ch->mq); |
198 | ch->mq = GNUNET_CLIENT_connecT (ch->cfg, | 198 | ch->mq = GNUNET_CLIENT_connect (ch->cfg, |
199 | "ats", | 199 | "ats", |
200 | handlers, | 200 | handlers, |
201 | &error_handler, | 201 | &error_handler, |
diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c index dd8666d4c..cd67583d1 100644 --- a/src/ats/ats_api_performance.c +++ b/src/ats/ats_api_performance.c | |||
@@ -585,7 +585,7 @@ reconnect (struct GNUNET_ATS_PerformanceHandle *ph) | |||
585 | struct ClientStartMessage *init; | 585 | struct ClientStartMessage *init; |
586 | 586 | ||
587 | GNUNET_assert (NULL == ph->mq); | 587 | GNUNET_assert (NULL == ph->mq); |
588 | ph->mq = GNUNET_CLIENT_connecT (ph->cfg, | 588 | ph->mq = GNUNET_CLIENT_connect (ph->cfg, |
589 | "ats", | 589 | "ats", |
590 | handlers, | 590 | handlers, |
591 | &mq_error_handler, | 591 | &mq_error_handler, |
diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index 4a872b90a..faeeb6081 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c | |||
@@ -532,7 +532,7 @@ reconnect (struct GNUNET_ATS_SchedulingHandle *sh) | |||
532 | struct GNUNET_ATS_AddressRecord *ar; | 532 | struct GNUNET_ATS_AddressRecord *ar; |
533 | 533 | ||
534 | GNUNET_assert (NULL == sh->mq); | 534 | GNUNET_assert (NULL == sh->mq); |
535 | sh->mq = GNUNET_CLIENT_connecT (sh->cfg, | 535 | sh->mq = GNUNET_CLIENT_connect (sh->cfg, |
536 | "ats", | 536 | "ats", |
537 | handlers, | 537 | handlers, |
538 | &error_handler, | 538 | &error_handler, |
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index d75815588..23305d8a9 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c | |||
@@ -1282,7 +1282,7 @@ do_reconnect (struct GNUNET_CADET_Handle *h) | |||
1282 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CADET\n"); | 1282 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to CADET\n"); |
1283 | 1283 | ||
1284 | GNUNET_assert (NULL == h->mq); | 1284 | GNUNET_assert (NULL == h->mq); |
1285 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 1285 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
1286 | "cadet", | 1286 | "cadet", |
1287 | handlers, | 1287 | handlers, |
1288 | &handle_mq_error, | 1288 | &handle_mq_error, |
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c index 918bf4e0c..c1e2d3224 100644 --- a/src/cadet/gnunet-service-cadet_peer.c +++ b/src/cadet/gnunet-service-cadet_peer.c | |||
@@ -655,7 +655,7 @@ connect_to_core (const struct GNUNET_CONFIGURATION_Handle *c) | |||
655 | NULL), | 655 | NULL), |
656 | GNUNET_MQ_handler_end () | 656 | GNUNET_MQ_handler_end () |
657 | }; | 657 | }; |
658 | core_handle = GNUNET_CORE_connecT (c, NULL, | 658 | core_handle = GNUNET_CORE_connect (c, NULL, |
659 | &core_init_notify, | 659 | &core_init_notify, |
660 | &core_connect_handler, | 660 | &core_connect_handler, |
661 | &core_disconnect_handler, | 661 | &core_disconnect_handler, |
@@ -686,7 +686,7 @@ core_init_notify (void *cls, | |||
686 | LOG (GNUNET_ERROR_TYPE_ERROR, _("Wrong CORE service\n")); | 686 | LOG (GNUNET_ERROR_TYPE_ERROR, _("Wrong CORE service\n")); |
687 | LOG (GNUNET_ERROR_TYPE_ERROR, " core id %s\n", GNUNET_i2s (core_identity)); | 687 | LOG (GNUNET_ERROR_TYPE_ERROR, " core id %s\n", GNUNET_i2s (core_identity)); |
688 | LOG (GNUNET_ERROR_TYPE_ERROR, " my id %s\n", GNUNET_i2s (&my_full_id)); | 688 | LOG (GNUNET_ERROR_TYPE_ERROR, " my id %s\n", GNUNET_i2s (&my_full_id)); |
689 | GNUNET_CORE_disconnecT (core_handle); | 689 | GNUNET_CORE_disconnect (core_handle); |
690 | connect_to_core (c); | 690 | connect_to_core (c); |
691 | return; | 691 | return; |
692 | } | 692 | } |
@@ -1325,12 +1325,12 @@ GCP_shutdown (void) | |||
1325 | in_shutdown = GNUNET_YES; | 1325 | in_shutdown = GNUNET_YES; |
1326 | if (NULL != core_handle) | 1326 | if (NULL != core_handle) |
1327 | { | 1327 | { |
1328 | GNUNET_CORE_disconnecT (core_handle); | 1328 | GNUNET_CORE_disconnect (core_handle); |
1329 | core_handle = NULL; | 1329 | core_handle = NULL; |
1330 | } | 1330 | } |
1331 | GNUNET_PEER_change_rc (myid, -1); | 1331 | GNUNET_PEER_change_rc (myid, -1); |
1332 | /* With MQ API, CORE calls the disconnect handler for every peer | 1332 | /* With MQ API, CORE calls the disconnect handler for every peer |
1333 | * after calling GNUNET_CORE_disconnecT, shutdown must occur *after* that. | 1333 | * after calling GNUNET_CORE_disconnect, shutdown must occur *after* that. |
1334 | */ | 1334 | */ |
1335 | GNUNET_CONTAINER_multipeermap_iterate (peers, | 1335 | GNUNET_CONTAINER_multipeermap_iterate (peers, |
1336 | &shutdown_peer, | 1336 | &shutdown_peer, |
diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c index 18898bebd..d5ed8db80 100644 --- a/src/consensus/consensus_api.c +++ b/src/consensus/consensus_api.c | |||
@@ -222,7 +222,7 @@ GNUNET_CONSENSUS_create (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
222 | consensus->new_element_cb = new_element_cb; | 222 | consensus->new_element_cb = new_element_cb; |
223 | consensus->new_element_cls = new_element_cls; | 223 | consensus->new_element_cls = new_element_cls; |
224 | consensus->session_id = *session_id; | 224 | consensus->session_id = *session_id; |
225 | consensus->mq = GNUNET_CLIENT_connecT (cfg, | 225 | consensus->mq = GNUNET_CLIENT_connect (cfg, |
226 | "consensus", | 226 | "consensus", |
227 | mq_handlers, | 227 | mq_handlers, |
228 | &mq_error_handler, | 228 | &mq_error_handler, |
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c index 8a74f0ca6..0b3920633 100644 --- a/src/conversation/conversation_api.c +++ b/src/conversation/conversation_api.c | |||
@@ -584,7 +584,7 @@ reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone) | |||
584 | phone->mq = NULL; | 584 | phone->mq = NULL; |
585 | } | 585 | } |
586 | phone->state = PS_REGISTER; | 586 | phone->state = PS_REGISTER; |
587 | phone->mq = GNUNET_CLIENT_connecT (phone->cfg, | 587 | phone->mq = GNUNET_CLIENT_connect (phone->cfg, |
588 | "conversation", | 588 | "conversation", |
589 | handlers, | 589 | handlers, |
590 | &phone_error_handler, | 590 | &phone_error_handler, |
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c index 17e26465e..a6bc506bc 100644 --- a/src/conversation/conversation_api_call.c +++ b/src/conversation/conversation_api_call.c | |||
@@ -570,7 +570,7 @@ GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
570 | }; | 570 | }; |
571 | struct GNUNET_CRYPTO_EcdsaPublicKey my_zone; | 571 | struct GNUNET_CRYPTO_EcdsaPublicKey my_zone; |
572 | 572 | ||
573 | call->mq = GNUNET_CLIENT_connecT (cfg, | 573 | call->mq = GNUNET_CLIENT_connect (cfg, |
574 | "conversation", | 574 | "conversation", |
575 | handlers, | 575 | handlers, |
576 | &call_error_handler, | 576 | &call_error_handler, |
diff --git a/src/core/core_api.c b/src/core/core_api.c index cf7924a0d..ace80b952 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c | |||
@@ -97,12 +97,12 @@ struct GNUNET_CORE_Handle | |||
97 | /** | 97 | /** |
98 | * Function to call whenever we're notified about a peer connecting. | 98 | * Function to call whenever we're notified about a peer connecting. |
99 | */ | 99 | */ |
100 | GNUNET_CORE_ConnecTEventHandler connects; | 100 | GNUNET_CORE_ConnectEventHandler connects; |
101 | 101 | ||
102 | /** | 102 | /** |
103 | * Function to call whenever we're notified about a peer disconnecting. | 103 | * Function to call whenever we're notified about a peer disconnecting. |
104 | */ | 104 | */ |
105 | GNUNET_CORE_DisconnecTEventHandler disconnects; | 105 | GNUNET_CORE_DisconnectEventHandler disconnects; |
106 | 106 | ||
107 | /** | 107 | /** |
108 | * Function handlers for messages of particular type. | 108 | * Function handlers for messages of particular type. |
@@ -734,7 +734,7 @@ reconnect (struct GNUNET_CORE_Handle *h) | |||
734 | uint16_t *ts; | 734 | uint16_t *ts; |
735 | 735 | ||
736 | GNUNET_assert (NULL == h->mq); | 736 | GNUNET_assert (NULL == h->mq); |
737 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 737 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
738 | "core", | 738 | "core", |
739 | handlers, | 739 | handlers, |
740 | &handle_mq_error, | 740 | &handle_mq_error, |
@@ -773,11 +773,11 @@ reconnect (struct GNUNET_CORE_Handle *h) | |||
773 | * NULL on error (in this case, init is never called) | 773 | * NULL on error (in this case, init is never called) |
774 | */ | 774 | */ |
775 | struct GNUNET_CORE_Handle * | 775 | struct GNUNET_CORE_Handle * |
776 | GNUNET_CORE_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg, | 776 | GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
777 | void *cls, | 777 | void *cls, |
778 | GNUNET_CORE_StartupCallback init, | 778 | GNUNET_CORE_StartupCallback init, |
779 | GNUNET_CORE_ConnecTEventHandler connects, | 779 | GNUNET_CORE_ConnectEventHandler connects, |
780 | GNUNET_CORE_DisconnecTEventHandler disconnects, | 780 | GNUNET_CORE_DisconnectEventHandler disconnects, |
781 | const struct GNUNET_MQ_MessageHandler *handlers) | 781 | const struct GNUNET_MQ_MessageHandler *handlers) |
782 | { | 782 | { |
783 | struct GNUNET_CORE_Handle *h; | 783 | struct GNUNET_CORE_Handle *h; |
@@ -810,7 +810,7 @@ GNUNET_CORE_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
810 | reconnect (h); | 810 | reconnect (h); |
811 | if (NULL == h->mq) | 811 | if (NULL == h->mq) |
812 | { | 812 | { |
813 | GNUNET_CORE_disconnecT (h); | 813 | GNUNET_CORE_disconnect (h); |
814 | return NULL; | 814 | return NULL; |
815 | } | 815 | } |
816 | return h; | 816 | return h; |
@@ -823,7 +823,7 @@ GNUNET_CORE_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
823 | * @param handle connection to core to disconnect | 823 | * @param handle connection to core to disconnect |
824 | */ | 824 | */ |
825 | void | 825 | void |
826 | GNUNET_CORE_disconnecT (struct GNUNET_CORE_Handle *handle) | 826 | GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle) |
827 | { | 827 | { |
828 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 828 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
829 | "Disconnecting from CORE service\n"); | 829 | "Disconnecting from CORE service\n"); |
diff --git a/src/core/core_api_monitor_peers.c b/src/core/core_api_monitor_peers.c index 1455eb2b0..796fdb9d5 100644 --- a/src/core/core_api_monitor_peers.c +++ b/src/core/core_api_monitor_peers.c | |||
@@ -127,7 +127,7 @@ reconnect (struct GNUNET_CORE_MonitorHandle *mh) | |||
127 | if (NULL != mh->mq) | 127 | if (NULL != mh->mq) |
128 | GNUNET_MQ_destroy (mh->mq); | 128 | GNUNET_MQ_destroy (mh->mq); |
129 | /* FIXME: use backoff? */ | 129 | /* FIXME: use backoff? */ |
130 | mh->mq = GNUNET_CLIENT_connecT (mh->cfg, | 130 | mh->mq = GNUNET_CLIENT_connect (mh->cfg, |
131 | "core", | 131 | "core", |
132 | handlers, | 132 | handlers, |
133 | &handle_mq_error, | 133 | &handle_mq_error, |
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index e6a113b52..847ba6e75 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c | |||
@@ -92,7 +92,7 @@ terminate_peer (struct PeerContext *p) | |||
92 | { | 92 | { |
93 | if (NULL != p->ch) | 93 | if (NULL != p->ch) |
94 | { | 94 | { |
95 | GNUNET_CORE_disconnecT (p->ch); | 95 | GNUNET_CORE_disconnect (p->ch); |
96 | p->ch = NULL; | 96 | p->ch = NULL; |
97 | } | 97 | } |
98 | if (NULL != p->ghh) | 98 | if (NULL != p->ghh) |
@@ -243,7 +243,7 @@ init_notify (void *cls, | |||
243 | GNUNET_assert (ok == 2); | 243 | GNUNET_assert (ok == 2); |
244 | OKPP; | 244 | OKPP; |
245 | /* connect p2 */ | 245 | /* connect p2 */ |
246 | p2.ch = GNUNET_CORE_connecT (p2.cfg, | 246 | p2.ch = GNUNET_CORE_connect (p2.cfg, |
247 | &p2, | 247 | &p2, |
248 | &init_notify, | 248 | &init_notify, |
249 | &connect_notify, | 249 | &connect_notify, |
@@ -317,7 +317,7 @@ run (void *cls, | |||
317 | (GNUNET_TIME_UNIT_SECONDS, 300), | 317 | (GNUNET_TIME_UNIT_SECONDS, 300), |
318 | &terminate_task_error, NULL); | 318 | &terminate_task_error, NULL); |
319 | p1.ch = | 319 | p1.ch = |
320 | GNUNET_CORE_connecT (p1.cfg, | 320 | GNUNET_CORE_connect (p1.cfg, |
321 | &p1, | 321 | &p1, |
322 | &init_notify, | 322 | &init_notify, |
323 | &connect_notify, | 323 | &connect_notify, |
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index cd2bcad83..900c9f732 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c | |||
@@ -103,7 +103,7 @@ terminate_peer (struct PeerContext *p) | |||
103 | { | 103 | { |
104 | if (NULL != p->ch) | 104 | if (NULL != p->ch) |
105 | { | 105 | { |
106 | GNUNET_CORE_disconnecT (p->ch); | 106 | GNUNET_CORE_disconnect (p->ch); |
107 | p->ch = NULL; | 107 | p->ch = NULL; |
108 | } | 108 | } |
109 | if (NULL != p->ghh) | 109 | if (NULL != p->ghh) |
@@ -341,7 +341,7 @@ init_notify (void *cls, | |||
341 | OKPP; | 341 | OKPP; |
342 | /* connect p2 */ | 342 | /* connect p2 */ |
343 | GNUNET_assert (NULL != | 343 | GNUNET_assert (NULL != |
344 | (p2.ch = GNUNET_CORE_connecT (p2.cfg, | 344 | (p2.ch = GNUNET_CORE_connect (p2.cfg, |
345 | &p2, | 345 | &p2, |
346 | &init_notify, | 346 | &init_notify, |
347 | &connect_notify, | 347 | &connect_notify, |
@@ -464,7 +464,7 @@ run (void *cls, | |||
464 | NULL); | 464 | NULL); |
465 | 465 | ||
466 | GNUNET_assert (NULL != | 466 | GNUNET_assert (NULL != |
467 | (p1.ch = GNUNET_CORE_connecT (p1.cfg, | 467 | (p1.ch = GNUNET_CORE_connect (p1.cfg, |
468 | &p1, | 468 | &p1, |
469 | &init_notify, | 469 | &init_notify, |
470 | &connect_notify, | 470 | &connect_notify, |
diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c index d29da651b..5cfc8b35f 100644 --- a/src/core/test_core_api_send_to_self.c +++ b/src/core/test_core_api_send_to_self.c | |||
@@ -65,7 +65,7 @@ cleanup (void *cls) | |||
65 | } | 65 | } |
66 | if (NULL != core) | 66 | if (NULL != core) |
67 | { | 67 | { |
68 | GNUNET_CORE_disconnecT (core); | 68 | GNUNET_CORE_disconnect (core); |
69 | core = NULL; | 69 | core = NULL; |
70 | } | 70 | } |
71 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 71 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -159,7 +159,7 @@ run (void *cls, | |||
159 | }; | 159 | }; |
160 | 160 | ||
161 | core = | 161 | core = |
162 | GNUNET_CORE_connecT (cfg, | 162 | GNUNET_CORE_connect (cfg, |
163 | NULL, | 163 | NULL, |
164 | &init, | 164 | &init, |
165 | &connect_cb, | 165 | &connect_cb, |
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index 6abc3cc89..31e300b14 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c | |||
@@ -74,9 +74,9 @@ static struct GNUNET_MQ_MessageHandler handlers[] = { | |||
74 | static void | 74 | static void |
75 | shutdown_task (void *cls) | 75 | shutdown_task (void *cls) |
76 | { | 76 | { |
77 | GNUNET_CORE_disconnecT (p1.ch); | 77 | GNUNET_CORE_disconnect (p1.ch); |
78 | p1.ch = NULL; | 78 | p1.ch = NULL; |
79 | GNUNET_CORE_disconnecT (p2.ch); | 79 | GNUNET_CORE_disconnect (p2.ch); |
80 | p2.ch = NULL; | 80 | p2.ch = NULL; |
81 | ok = 0; | 81 | ok = 0; |
82 | } | 82 | } |
@@ -91,7 +91,7 @@ init_notify (void *cls, | |||
91 | if (p == &p1) | 91 | if (p == &p1) |
92 | { | 92 | { |
93 | /* connect p2 */ | 93 | /* connect p2 */ |
94 | p2.ch = GNUNET_CORE_connecT (p2.cfg, | 94 | p2.ch = GNUNET_CORE_connect (p2.cfg, |
95 | &p2, | 95 | &p2, |
96 | &init_notify, | 96 | &init_notify, |
97 | &connect_notify, | 97 | &connect_notify, |
@@ -140,12 +140,12 @@ timeout_task (void *cls) | |||
140 | "Timeout.\n"); | 140 | "Timeout.\n"); |
141 | if (NULL != p1.ch) | 141 | if (NULL != p1.ch) |
142 | { | 142 | { |
143 | GNUNET_CORE_disconnecT (p1.ch); | 143 | GNUNET_CORE_disconnect (p1.ch); |
144 | p1.ch = NULL; | 144 | p1.ch = NULL; |
145 | } | 145 | } |
146 | if (NULL != p2.ch) | 146 | if (NULL != p2.ch) |
147 | { | 147 | { |
148 | GNUNET_CORE_disconnecT (p2.ch); | 148 | GNUNET_CORE_disconnect (p2.ch); |
149 | p2.ch = NULL; | 149 | p2.ch = NULL; |
150 | } | 150 | } |
151 | ok = 42; | 151 | ok = 42; |
@@ -168,7 +168,7 @@ run (void *cls, | |||
168 | TIMEOUT), | 168 | TIMEOUT), |
169 | &timeout_task, | 169 | &timeout_task, |
170 | NULL); | 170 | NULL); |
171 | p1.ch = GNUNET_CORE_connecT (p1.cfg, | 171 | p1.ch = GNUNET_CORE_connect (p1.cfg, |
172 | &p1, | 172 | &p1, |
173 | &init_notify, | 173 | &init_notify, |
174 | &connect_notify, | 174 | &connect_notify, |
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 4dee958f2..dcc33288d 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -117,7 +117,7 @@ terminate_peer (struct PeerContext *p) | |||
117 | { | 117 | { |
118 | if (NULL != p->ch) | 118 | if (NULL != p->ch) |
119 | { | 119 | { |
120 | GNUNET_CORE_disconnecT (p->ch); | 120 | GNUNET_CORE_disconnect (p->ch); |
121 | p->ch = NULL; | 121 | p->ch = NULL; |
122 | } | 122 | } |
123 | if (NULL != p->ghh) | 123 | if (NULL != p->ghh) |
@@ -480,7 +480,7 @@ init_notify (void *cls, | |||
480 | GNUNET_assert (ok == 2); | 480 | GNUNET_assert (ok == 2); |
481 | OKPP; | 481 | OKPP; |
482 | /* connect p2 */ | 482 | /* connect p2 */ |
483 | p2.ch = GNUNET_CORE_connecT (p2.cfg, | 483 | p2.ch = GNUNET_CORE_connect (p2.cfg, |
484 | &p2, | 484 | &p2, |
485 | &init_notify, | 485 | &init_notify, |
486 | &connect_notify, | 486 | &connect_notify, |
@@ -653,7 +653,7 @@ run (void *cls, | |||
653 | "WAN_QUOTA_OUT", | 653 | "WAN_QUOTA_OUT", |
654 | ¤t_quota_p2_out)); | 654 | ¤t_quota_p2_out)); |
655 | 655 | ||
656 | p1.ch = GNUNET_CORE_connecT (p1.cfg, | 656 | p1.ch = GNUNET_CORE_connect (p1.cfg, |
657 | &p1, | 657 | &p1, |
658 | &init_notify, | 658 | &init_notify, |
659 | &connect_notify, | 659 | &connect_notify, |
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c index d75a58552..db485364e 100644 --- a/src/datastore/datastore_api.c +++ b/src/datastore/datastore_api.c | |||
@@ -443,7 +443,7 @@ GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h, | |||
443 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 443 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
444 | "Re-connecting to issue DROP!\n"); | 444 | "Re-connecting to issue DROP!\n"); |
445 | GNUNET_assert (NULL == h->mq); | 445 | GNUNET_assert (NULL == h->mq); |
446 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 446 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
447 | "datastore", | 447 | "datastore", |
448 | NULL, | 448 | NULL, |
449 | &disconnect_on_mq_error, | 449 | &disconnect_on_mq_error, |
@@ -868,7 +868,7 @@ try_reconnect (void *cls) | |||
868 | h->retry_time = GNUNET_TIME_STD_BACKOFF (h->retry_time); | 868 | h->retry_time = GNUNET_TIME_STD_BACKOFF (h->retry_time); |
869 | h->reconnect_task = NULL; | 869 | h->reconnect_task = NULL; |
870 | GNUNET_assert (NULL == h->mq); | 870 | GNUNET_assert (NULL == h->mq); |
871 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 871 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
872 | "datastore", | 872 | "datastore", |
873 | handlers, | 873 | handlers, |
874 | &mq_error_handler, | 874 | &mq_error_handler, |
diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c index 57880165e..66eaf1064 100644 --- a/src/dht/dht_api.c +++ b/src/dht/dht_api.c | |||
@@ -867,7 +867,7 @@ try_connect (struct GNUNET_DHT_Handle *h) | |||
867 | }; | 867 | }; |
868 | if (NULL != h->mq) | 868 | if (NULL != h->mq) |
869 | return GNUNET_OK; | 869 | return GNUNET_OK; |
870 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 870 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
871 | "dht", | 871 | "dht", |
872 | handlers, | 872 | handlers, |
873 | &mq_error_handler, | 873 | &mq_error_handler, |
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 0d3594d1a..20bdc0ce4 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c | |||
@@ -2381,7 +2381,7 @@ GDS_NEIGHBOURS_init () | |||
2381 | log_route_details_stderr = | 2381 | log_route_details_stderr = |
2382 | (NULL != getenv("GNUNET_DHT_ROUTE_DEBUG")) ? GNUNET_YES : GNUNET_NO; | 2382 | (NULL != getenv("GNUNET_DHT_ROUTE_DEBUG")) ? GNUNET_YES : GNUNET_NO; |
2383 | ats_ch = GNUNET_ATS_connectivity_init (GDS_cfg); | 2383 | ats_ch = GNUNET_ATS_connectivity_init (GDS_cfg); |
2384 | core_api = GNUNET_CORE_connecT (GDS_cfg, | 2384 | core_api = GNUNET_CORE_connect (GDS_cfg, |
2385 | NULL, | 2385 | NULL, |
2386 | &core_init, | 2386 | &core_init, |
2387 | &handle_core_connect, | 2387 | &handle_core_connect, |
@@ -2405,7 +2405,7 @@ GDS_NEIGHBOURS_done () | |||
2405 | { | 2405 | { |
2406 | if (NULL == core_api) | 2406 | if (NULL == core_api) |
2407 | return; | 2407 | return; |
2408 | GNUNET_CORE_disconnecT (core_api); | 2408 | GNUNET_CORE_disconnect (core_api); |
2409 | core_api = NULL; | 2409 | core_api = NULL; |
2410 | GNUNET_assert (0 == | 2410 | GNUNET_assert (0 == |
2411 | GNUNET_CONTAINER_multipeermap_size (all_connected_peers)); | 2411 | GNUNET_CONTAINER_multipeermap_size (all_connected_peers)); |
diff --git a/src/dht/gnunet-service-wdht_neighbours.c b/src/dht/gnunet-service-wdht_neighbours.c index d3b92585b..78a04d66d 100644 --- a/src/dht/gnunet-service-wdht_neighbours.c +++ b/src/dht/gnunet-service-wdht_neighbours.c | |||
@@ -1712,7 +1712,7 @@ GDS_NEIGHBOURS_init (void) | |||
1712 | GNUNET_MQ_handler_end () | 1712 | GNUNET_MQ_handler_end () |
1713 | }; | 1713 | }; |
1714 | 1714 | ||
1715 | core_api = GNUNET_CORE_connecT (GDS_cfg, NULL, | 1715 | core_api = GNUNET_CORE_connect (GDS_cfg, NULL, |
1716 | &core_init, | 1716 | &core_init, |
1717 | &handle_core_connect, | 1717 | &handle_core_connect, |
1718 | &handle_core_disconnect, | 1718 | &handle_core_disconnect, |
@@ -1736,7 +1736,7 @@ GDS_NEIGHBOURS_done (void) | |||
1736 | { | 1736 | { |
1737 | if (NULL == core_api) | 1737 | if (NULL == core_api) |
1738 | return; | 1738 | return; |
1739 | GNUNET_CORE_disconnecT (core_api); | 1739 | GNUNET_CORE_disconnect (core_api); |
1740 | core_api = NULL; | 1740 | core_api = NULL; |
1741 | GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (friends_peermap)); | 1741 | GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (friends_peermap)); |
1742 | GNUNET_CONTAINER_multipeermap_destroy (friends_peermap); | 1742 | GNUNET_CONTAINER_multipeermap_destroy (friends_peermap); |
diff --git a/src/dht/gnunet-service-xdht_neighbours.c b/src/dht/gnunet-service-xdht_neighbours.c index e3462f618..d41eb1900 100644 --- a/src/dht/gnunet-service-xdht_neighbours.c +++ b/src/dht/gnunet-service-xdht_neighbours.c | |||
@@ -6150,7 +6150,7 @@ GDS_NEIGHBOURS_init (void) | |||
6150 | GNUNET_MQ_handler_end () | 6150 | GNUNET_MQ_handler_end () |
6151 | }; | 6151 | }; |
6152 | 6152 | ||
6153 | core_api = GNUNET_CORE_connecT (GDS_cfg, | 6153 | core_api = GNUNET_CORE_connect (GDS_cfg, |
6154 | NULL, | 6154 | NULL, |
6155 | &core_init, | 6155 | &core_init, |
6156 | &handle_core_connect, | 6156 | &handle_core_connect, |
@@ -6212,7 +6212,7 @@ GDS_NEIGHBOURS_done (void) | |||
6212 | if (NULL == core_api) | 6212 | if (NULL == core_api) |
6213 | return; | 6213 | return; |
6214 | 6214 | ||
6215 | GNUNET_CORE_disconnecT (core_api); | 6215 | GNUNET_CORE_disconnect (core_api); |
6216 | core_api = NULL; | 6216 | core_api = NULL; |
6217 | 6217 | ||
6218 | delete_finger_table_entries(); | 6218 | delete_finger_table_entries(); |
diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c index 4803fe3fc..e7450a1d4 100644 --- a/src/dns/dns_api.c +++ b/src/dns/dns_api.c | |||
@@ -217,7 +217,7 @@ reconnect (void *cls) | |||
217 | struct GNUNET_DNS_Register *msg; | 217 | struct GNUNET_DNS_Register *msg; |
218 | 218 | ||
219 | dh->reconnect_task = NULL; | 219 | dh->reconnect_task = NULL; |
220 | dh->mq = GNUNET_CLIENT_connecT (dh->cfg, | 220 | dh->mq = GNUNET_CLIENT_connect (dh->cfg, |
221 | "dns", | 221 | "dns", |
222 | handlers, | 222 | handlers, |
223 | &mq_error_handler, | 223 | &mq_error_handler, |
diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c index 43b6c7db1..062f9a95f 100644 --- a/src/dv/dv_api.c +++ b/src/dv/dv_api.c | |||
@@ -346,7 +346,7 @@ reconnect (struct GNUNET_DV_ServiceHandle *sh) | |||
346 | sh); | 346 | sh); |
347 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 347 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
348 | "Connecting to DV service\n"); | 348 | "Connecting to DV service\n"); |
349 | sh->mq = GNUNET_CLIENT_connecT (sh->cfg, | 349 | sh->mq = GNUNET_CLIENT_connect (sh->cfg, |
350 | "dv", | 350 | "dv", |
351 | handlers, | 351 | handlers, |
352 | &mq_error_handler, | 352 | &mq_error_handler, |
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index fdd871bbd..6adaa04d9 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c | |||
@@ -1936,7 +1936,7 @@ shutdown_task (void *cls) | |||
1936 | 1936 | ||
1937 | in_shutdown = GNUNET_YES; | 1937 | in_shutdown = GNUNET_YES; |
1938 | GNUNET_assert (NULL != core_api); | 1938 | GNUNET_assert (NULL != core_api); |
1939 | GNUNET_CORE_disconnecT (core_api); | 1939 | GNUNET_CORE_disconnect (core_api); |
1940 | core_api = NULL; | 1940 | core_api = NULL; |
1941 | GNUNET_ATS_performance_done (ats); | 1941 | GNUNET_ATS_performance_done (ats); |
1942 | ats = NULL; | 1942 | ats = NULL; |
@@ -2059,7 +2059,7 @@ run (void *cls, | |||
2059 | GNUNET_NO); | 2059 | GNUNET_NO); |
2060 | all_routes = GNUNET_CONTAINER_multipeermap_create (65536, | 2060 | all_routes = GNUNET_CONTAINER_multipeermap_create (65536, |
2061 | GNUNET_NO); | 2061 | GNUNET_NO); |
2062 | core_api = GNUNET_CORE_connecT (cfg, | 2062 | core_api = GNUNET_CORE_connect (cfg, |
2063 | NULL, | 2063 | NULL, |
2064 | &core_init, | 2064 | &core_init, |
2065 | &handle_core_connect, | 2065 | &handle_core_connect, |
@@ -2073,7 +2073,7 @@ run (void *cls, | |||
2073 | NULL); | 2073 | NULL); |
2074 | if (NULL == ats) | 2074 | if (NULL == ats) |
2075 | { | 2075 | { |
2076 | GNUNET_CORE_disconnecT (core_api); | 2076 | GNUNET_CORE_disconnect (core_api); |
2077 | core_api = NULL; | 2077 | core_api = NULL; |
2078 | return; | 2078 | return; |
2079 | } | 2079 | } |
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index eacc3c2df..53b836f22 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c | |||
@@ -1335,7 +1335,7 @@ do_reconnect (void *cls) | |||
1335 | }; | 1335 | }; |
1336 | 1336 | ||
1337 | dc->task = NULL; | 1337 | dc->task = NULL; |
1338 | dc->mq = GNUNET_CLIENT_connecT (dc->h->cfg, | 1338 | dc->mq = GNUNET_CLIENT_connect (dc->h->cfg, |
1339 | "fs", | 1339 | "fs", |
1340 | handlers, | 1340 | handlers, |
1341 | &download_mq_error_handler, | 1341 | &download_mq_error_handler, |
diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c index 67183fce2..eec125a10 100644 --- a/src/fs/fs_list_indexed.c +++ b/src/fs/fs_list_indexed.c | |||
@@ -185,7 +185,7 @@ GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h, | |||
185 | struct GNUNET_MQ_Envelope *env; | 185 | struct GNUNET_MQ_Envelope *env; |
186 | struct GNUNET_MessageHeader *msg; | 186 | struct GNUNET_MessageHeader *msg; |
187 | 187 | ||
188 | gic->mq = GNUNET_CLIENT_connecT (h->cfg, | 188 | gic->mq = GNUNET_CLIENT_connect (h->cfg, |
189 | "fs", | 189 | "fs", |
190 | handlers, | 190 | handlers, |
191 | &mq_error_handler, | 191 | &mq_error_handler, |
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 5820c3d0c..86a58a58b 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c | |||
@@ -863,7 +863,7 @@ hash_for_index_cb (void *cls, | |||
863 | GNUNET_free (fn); | 863 | GNUNET_free (fn); |
864 | return; | 864 | return; |
865 | } | 865 | } |
866 | pc->mq = GNUNET_CLIENT_connecT (pc->h->cfg, | 866 | pc->mq = GNUNET_CLIENT_connect (pc->h->cfg, |
867 | "fs", | 867 | "fs", |
868 | handlers, | 868 | handlers, |
869 | &index_mq_error_handler, | 869 | &index_mq_error_handler, |
@@ -1016,7 +1016,7 @@ create_loc_uri (struct GNUNET_FS_PublishContext *pc) | |||
1016 | 1016 | ||
1017 | if (NULL != pc->mq) | 1017 | if (NULL != pc->mq) |
1018 | GNUNET_MQ_destroy (pc->mq); | 1018 | GNUNET_MQ_destroy (pc->mq); |
1019 | pc->mq = GNUNET_CLIENT_connecT (pc->h->cfg, | 1019 | pc->mq = GNUNET_CLIENT_connect (pc->h->cfg, |
1020 | "fs", | 1020 | "fs", |
1021 | handlers, | 1021 | handlers, |
1022 | &loc_mq_error_handler, | 1022 | &loc_mq_error_handler, |
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index 198577b08..75ce4b54f 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c | |||
@@ -1244,7 +1244,7 @@ do_reconnect (void *cls) | |||
1244 | }; | 1244 | }; |
1245 | 1245 | ||
1246 | sc->task = NULL; | 1246 | sc->task = NULL; |
1247 | sc->mq = GNUNET_CLIENT_connecT (sc->h->cfg, | 1247 | sc->mq = GNUNET_CLIENT_connect (sc->h->cfg, |
1248 | "fs", | 1248 | "fs", |
1249 | handlers, | 1249 | handlers, |
1250 | &search_mq_error_handler, | 1250 | &search_mq_error_handler, |
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c index 2a024ecbb..a672b84d5 100644 --- a/src/fs/fs_unindex.c +++ b/src/fs/fs_unindex.c | |||
@@ -316,7 +316,7 @@ unindex_finish (struct GNUNET_FS_UnindexContext *uc) | |||
316 | uc->seen_dh = NULL; | 316 | uc->seen_dh = NULL; |
317 | uc->state = UNINDEX_STATE_FS_NOTIFY; | 317 | uc->state = UNINDEX_STATE_FS_NOTIFY; |
318 | GNUNET_FS_unindex_sync_ (uc); | 318 | GNUNET_FS_unindex_sync_ (uc); |
319 | uc->mq = GNUNET_CLIENT_connecT (uc->h->cfg, | 319 | uc->mq = GNUNET_CLIENT_connect (uc->h->cfg, |
320 | "fs", | 320 | "fs", |
321 | handlers, | 321 | handlers, |
322 | &unindex_mq_error_handler, | 322 | &unindex_mq_error_handler, |
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index c83d73555..e38fdb032 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -1181,7 +1181,7 @@ shutdown_task (void *cls) | |||
1181 | GSF_cadet_stop_server (); | 1181 | GSF_cadet_stop_server (); |
1182 | if (NULL != GSF_core) | 1182 | if (NULL != GSF_core) |
1183 | { | 1183 | { |
1184 | GNUNET_CORE_disconnecT (GSF_core); | 1184 | GNUNET_CORE_disconnect (GSF_core); |
1185 | GSF_core = NULL; | 1185 | GSF_core = NULL; |
1186 | } | 1186 | } |
1187 | if (NULL != GSF_ats) | 1187 | if (NULL != GSF_ats) |
@@ -1219,7 +1219,7 @@ shutdown_task (void *cls) | |||
1219 | 1219 | ||
1220 | 1220 | ||
1221 | /** | 1221 | /** |
1222 | * Function called after GNUNET_CORE_connecT has succeeded | 1222 | * Function called after GNUNET_CORE_connect has succeeded |
1223 | * (or failed for good). Note that the private key of the | 1223 | * (or failed for good). Note that the private key of the |
1224 | * peer is intentionally not exposed here; if you need it, | 1224 | * peer is intentionally not exposed here; if you need it, |
1225 | * your process should try to read the private key file | 1225 | * your process should try to read the private key file |
@@ -1299,7 +1299,7 @@ main_init (const struct GNUNET_CONFIGURATION_Handle *c) | |||
1299 | "I am peer %s\n", | 1299 | "I am peer %s\n", |
1300 | GNUNET_i2s (&GSF_my_id)); | 1300 | GNUNET_i2s (&GSF_my_id)); |
1301 | GSF_core | 1301 | GSF_core |
1302 | = GNUNET_CORE_connecT (GSF_cfg, | 1302 | = GNUNET_CORE_connect (GSF_cfg, |
1303 | NULL, | 1303 | NULL, |
1304 | &peer_init_handler, | 1304 | &peer_init_handler, |
1305 | &GSF_peer_connect_handler, | 1305 | &GSF_peer_connect_handler, |
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c index 3f6425b42..5d6158bd4 100644 --- a/src/gns/gns_api.c +++ b/src/gns/gns_api.c | |||
@@ -394,7 +394,7 @@ reconnect (struct GNUNET_GNS_Handle *handle) | |||
394 | GNUNET_assert (NULL == handle->mq); | 394 | GNUNET_assert (NULL == handle->mq); |
395 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 395 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
396 | "Trying to connect to GNS\n"); | 396 | "Trying to connect to GNS\n"); |
397 | handle->mq = GNUNET_CLIENT_connecT (handle->cfg, | 397 | handle->mq = GNUNET_CLIENT_connect (handle->cfg, |
398 | "gns", | 398 | "gns", |
399 | handlers, | 399 | handlers, |
400 | &mq_error_handler, | 400 | &mq_error_handler, |
diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c index 7181a913b..a83d46e07 100644 --- a/src/hostlist/gnunet-daemon-hostlist.c +++ b/src/hostlist/gnunet-daemon-hostlist.c | |||
@@ -47,7 +47,7 @@ static int provide_hostlist; | |||
47 | /** | 47 | /** |
48 | * Handle to hostlist server's connect handler | 48 | * Handle to hostlist server's connect handler |
49 | */ | 49 | */ |
50 | static GNUNET_CORE_ConnecTEventHandler server_ch; | 50 | static GNUNET_CORE_ConnectEventHandler server_ch; |
51 | 51 | ||
52 | #endif | 52 | #endif |
53 | 53 | ||
@@ -81,12 +81,12 @@ static GNUNET_HOSTLIST_UriHandler client_adv_handler; | |||
81 | /** | 81 | /** |
82 | * Handle to hostlist client's connect handler | 82 | * Handle to hostlist client's connect handler |
83 | */ | 83 | */ |
84 | static GNUNET_CORE_ConnecTEventHandler client_ch; | 84 | static GNUNET_CORE_ConnectEventHandler client_ch; |
85 | 85 | ||
86 | /** | 86 | /** |
87 | * Handle to hostlist client's disconnect handler | 87 | * Handle to hostlist client's disconnect handler |
88 | */ | 88 | */ |
89 | static GNUNET_CORE_DisconnecTEventHandler client_dh; | 89 | static GNUNET_CORE_DisconnectEventHandler client_dh; |
90 | 90 | ||
91 | GNUNET_NETWORK_STRUCT_BEGIN | 91 | GNUNET_NETWORK_STRUCT_BEGIN |
92 | 92 | ||
@@ -260,7 +260,7 @@ cleaning_task (void *cls) | |||
260 | "Hostlist daemon is shutting down\n"); | 260 | "Hostlist daemon is shutting down\n"); |
261 | if (NULL != core) | 261 | if (NULL != core) |
262 | { | 262 | { |
263 | GNUNET_CORE_disconnecT (core); | 263 | GNUNET_CORE_disconnect (core); |
264 | core = NULL; | 264 | core = NULL; |
265 | } | 265 | } |
266 | if (bootstrapping) | 266 | if (bootstrapping) |
@@ -330,7 +330,7 @@ run (void *cls, | |||
330 | &client_adv_handler, | 330 | &client_adv_handler, |
331 | learning); | 331 | learning); |
332 | core = | 332 | core = |
333 | GNUNET_CORE_connecT (cfg, | 333 | GNUNET_CORE_connect (cfg, |
334 | NULL, | 334 | NULL, |
335 | &core_init, | 335 | &core_init, |
336 | &connect_handler, | 336 | &connect_handler, |
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c index c1a2c2721..a973fcc28 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.c +++ b/src/hostlist/gnunet-daemon-hostlist_client.c | |||
@@ -1548,8 +1548,8 @@ save_hostlist_file (int shutdown) | |||
1548 | int | 1548 | int |
1549 | GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c, | 1549 | GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c, |
1550 | struct GNUNET_STATISTICS_Handle *st, | 1550 | struct GNUNET_STATISTICS_Handle *st, |
1551 | GNUNET_CORE_ConnecTEventHandler *ch, | 1551 | GNUNET_CORE_ConnectEventHandler *ch, |
1552 | GNUNET_CORE_DisconnecTEventHandler *dh, | 1552 | GNUNET_CORE_DisconnectEventHandler *dh, |
1553 | GNUNET_HOSTLIST_UriHandler *msgh, | 1553 | GNUNET_HOSTLIST_UriHandler *msgh, |
1554 | int learn) | 1554 | int learn) |
1555 | { | 1555 | { |
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.h b/src/hostlist/gnunet-daemon-hostlist_client.h index dd80d4a48..e41b90876 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.h +++ b/src/hostlist/gnunet-daemon-hostlist_client.h | |||
@@ -53,8 +53,8 @@ typedef void | |||
53 | int | 53 | int |
54 | GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c, | 54 | GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c, |
55 | struct GNUNET_STATISTICS_Handle *st, | 55 | struct GNUNET_STATISTICS_Handle *st, |
56 | GNUNET_CORE_ConnecTEventHandler *ch, | 56 | GNUNET_CORE_ConnectEventHandler *ch, |
57 | GNUNET_CORE_DisconnecTEventHandler *dh, | 57 | GNUNET_CORE_DisconnectEventHandler *dh, |
58 | GNUNET_HOSTLIST_UriHandler *msgh, | 58 | GNUNET_HOSTLIST_UriHandler *msgh, |
59 | int learn); | 59 | int learn); |
60 | 60 | ||
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c index b01dbc09e..48c1a5622 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.c +++ b/src/hostlist/gnunet-daemon-hostlist_server.c | |||
@@ -644,7 +644,7 @@ int | |||
644 | GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c, | 644 | GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c, |
645 | struct GNUNET_STATISTICS_Handle *st, | 645 | struct GNUNET_STATISTICS_Handle *st, |
646 | struct GNUNET_CORE_Handle *co, | 646 | struct GNUNET_CORE_Handle *co, |
647 | GNUNET_CORE_ConnecTEventHandler *server_ch, | 647 | GNUNET_CORE_ConnectEventHandler *server_ch, |
648 | int advertise) | 648 | int advertise) |
649 | { | 649 | { |
650 | unsigned long long port; | 650 | unsigned long long port; |
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.h b/src/hostlist/gnunet-daemon-hostlist_server.h index f18ad0ca2..d9f778a4b 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.h +++ b/src/hostlist/gnunet-daemon-hostlist_server.h | |||
@@ -46,7 +46,7 @@ int | |||
46 | GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c, | 46 | GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c, |
47 | struct GNUNET_STATISTICS_Handle *st, | 47 | struct GNUNET_STATISTICS_Handle *st, |
48 | struct GNUNET_CORE_Handle *core, | 48 | struct GNUNET_CORE_Handle *core, |
49 | GNUNET_CORE_ConnecTEventHandler *server_ch, | 49 | GNUNET_CORE_ConnectEventHandler *server_ch, |
50 | int advertise); | 50 | int advertise); |
51 | 51 | ||
52 | 52 | ||
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 48689e259..88ad22a1a 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c | |||
@@ -125,12 +125,12 @@ shutdown_testcase () | |||
125 | } | 125 | } |
126 | if (NULL != adv_peer.core) | 126 | if (NULL != adv_peer.core) |
127 | { | 127 | { |
128 | GNUNET_CORE_disconnecT (adv_peer.core); | 128 | GNUNET_CORE_disconnect (adv_peer.core); |
129 | adv_peer.core = NULL; | 129 | adv_peer.core = NULL; |
130 | } | 130 | } |
131 | if (NULL != learn_peer.core) | 131 | if (NULL != learn_peer.core) |
132 | { | 132 | { |
133 | GNUNET_CORE_disconnecT (learn_peer.core); | 133 | GNUNET_CORE_disconnect (learn_peer.core); |
134 | learn_peer.core = NULL; | 134 | learn_peer.core = NULL; |
135 | } | 135 | } |
136 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 136 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -432,7 +432,7 @@ setup_learn_peer (struct PeerContext *p, | |||
432 | } | 432 | } |
433 | GNUNET_free (filename); | 433 | GNUNET_free (filename); |
434 | } | 434 | } |
435 | p->core = GNUNET_CORE_connecT (p->cfg, | 435 | p->core = GNUNET_CORE_connect (p->cfg, |
436 | NULL, | 436 | NULL, |
437 | NULL, | 437 | NULL, |
438 | NULL, | 438 | NULL, |
diff --git a/src/identity-provider/identity_provider_api.c b/src/identity-provider/identity_provider_api.c index 28ff90fc4..32c3cb703 100644 --- a/src/identity-provider/identity_provider_api.c +++ b/src/identity-provider/identity_provider_api.c | |||
@@ -380,7 +380,7 @@ reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h) | |||
380 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 380 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
381 | "Connecting to identity provider service.\n"); | 381 | "Connecting to identity provider service.\n"); |
382 | 382 | ||
383 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 383 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
384 | "identity-provider", | 384 | "identity-provider", |
385 | handlers, | 385 | handlers, |
386 | &mq_error_handler, | 386 | &mq_error_handler, |
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c index 10a64d1ba..905b3fd8b 100644 --- a/src/identity/identity_api.c +++ b/src/identity/identity_api.c | |||
@@ -575,7 +575,7 @@ reconnect (void *cls) | |||
575 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 575 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
576 | "Connecting to identity service.\n"); | 576 | "Connecting to identity service.\n"); |
577 | GNUNET_assert (NULL == h->mq); | 577 | GNUNET_assert (NULL == h->mq); |
578 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 578 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
579 | "identity", | 579 | "identity", |
580 | handlers, | 580 | handlers, |
581 | &mq_error_handler, | 581 | &mq_error_handler, |
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h index f98620dfa..613349fdd 100644 --- a/src/include/gnunet_client_lib.h +++ b/src/include/gnunet_client_lib.h | |||
@@ -57,7 +57,7 @@ extern "C" | |||
57 | * @return the message queue, NULL on error | 57 | * @return the message queue, NULL on error |
58 | */ | 58 | */ |
59 | struct GNUNET_MQ_Handle * | 59 | struct GNUNET_MQ_Handle * |
60 | GNUNET_CLIENT_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg, | 60 | GNUNET_CLIENT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
61 | const char *service_name, | 61 | const char *service_name, |
62 | const struct GNUNET_MQ_MessageHandler *handlers, | 62 | const struct GNUNET_MQ_MessageHandler *handlers, |
63 | GNUNET_MQ_ErrorHandler error_handler, | 63 | GNUNET_MQ_ErrorHandler error_handler, |
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index 6ec486b26..6b082601b 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h | |||
@@ -114,7 +114,7 @@ typedef void | |||
114 | * @param peer peer identity this notification is about | 114 | * @param peer peer identity this notification is about |
115 | */ | 115 | */ |
116 | typedef void * | 116 | typedef void * |
117 | (*GNUNET_CORE_ConnecTEventHandler) (void *cls, | 117 | (*GNUNET_CORE_ConnectEventHandler) (void *cls, |
118 | const struct GNUNET_PeerIdentity *peer, | 118 | const struct GNUNET_PeerIdentity *peer, |
119 | struct GNUNET_MQ_Handle *mq); | 119 | struct GNUNET_MQ_Handle *mq); |
120 | 120 | ||
@@ -126,7 +126,7 @@ typedef void * | |||
126 | * @param peer peer identity this notification is about | 126 | * @param peer peer identity this notification is about |
127 | */ | 127 | */ |
128 | typedef void | 128 | typedef void |
129 | (*GNUNET_CORE_DisconnecTEventHandler) (void *cls, | 129 | (*GNUNET_CORE_DisconnectEventHandler) (void *cls, |
130 | const struct GNUNET_PeerIdentity *peer, | 130 | const struct GNUNET_PeerIdentity *peer, |
131 | void *peer_cls); | 131 | void *peer_cls); |
132 | 132 | ||
@@ -283,11 +283,11 @@ GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle); | |||
283 | * NULL on error (in this case, init is never called) | 283 | * NULL on error (in this case, init is never called) |
284 | */ | 284 | */ |
285 | struct GNUNET_CORE_Handle * | 285 | struct GNUNET_CORE_Handle * |
286 | GNUNET_CORE_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg, | 286 | GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
287 | void *cls, | 287 | void *cls, |
288 | GNUNET_CORE_StartupCallback init, | 288 | GNUNET_CORE_StartupCallback init, |
289 | GNUNET_CORE_ConnecTEventHandler connects, | 289 | GNUNET_CORE_ConnectEventHandler connects, |
290 | GNUNET_CORE_DisconnecTEventHandler disconnects, | 290 | GNUNET_CORE_DisconnectEventHandler disconnects, |
291 | const struct GNUNET_MQ_MessageHandler *handlers); | 291 | const struct GNUNET_MQ_MessageHandler *handlers); |
292 | 292 | ||
293 | 293 | ||
@@ -297,7 +297,7 @@ GNUNET_CORE_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
297 | * @param handle connection to core to disconnect | 297 | * @param handle connection to core to disconnect |
298 | */ | 298 | */ |
299 | void | 299 | void |
300 | GNUNET_CORE_disconnecT (struct GNUNET_CORE_Handle *handle); | 300 | GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle); |
301 | 301 | ||
302 | 302 | ||
303 | /** | 303 | /** |
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c index 7cfe70835..6e5402b28 100644 --- a/src/multicast/multicast_api.c +++ b/src/multicast/multicast_api.c | |||
@@ -786,7 +786,7 @@ origin_connect (struct GNUNET_MULTICAST_Origin *orig) | |||
786 | GNUNET_MQ_handler_end () | 786 | GNUNET_MQ_handler_end () |
787 | }; | 787 | }; |
788 | 788 | ||
789 | grp->mq = GNUNET_CLIENT_connecT (grp->cfg, "multicast", | 789 | grp->mq = GNUNET_CLIENT_connect (grp->cfg, "multicast", |
790 | handlers, origin_disconnected, orig); | 790 | handlers, origin_disconnected, orig); |
791 | GNUNET_assert (NULL != grp->mq); | 791 | GNUNET_assert (NULL != grp->mq); |
792 | GNUNET_MQ_send_copy (grp->mq, grp->connect_env); | 792 | GNUNET_MQ_send_copy (grp->mq, grp->connect_env); |
@@ -1076,7 +1076,7 @@ member_connect (struct GNUNET_MULTICAST_Member *mem) | |||
1076 | GNUNET_MQ_handler_end () | 1076 | GNUNET_MQ_handler_end () |
1077 | }; | 1077 | }; |
1078 | 1078 | ||
1079 | grp->mq = GNUNET_CLIENT_connecT (grp->cfg, "multicast", | 1079 | grp->mq = GNUNET_CLIENT_connect (grp->cfg, "multicast", |
1080 | handlers, member_disconnected, mem); | 1080 | handlers, member_disconnected, mem); |
1081 | GNUNET_assert (NULL != grp->mq); | 1081 | GNUNET_assert (NULL != grp->mq); |
1082 | GNUNET_MQ_send_copy (grp->mq, grp->connect_env); | 1082 | GNUNET_MQ_send_copy (grp->mq, grp->connect_env); |
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c index 9ccb91bc8..c12dacd4c 100644 --- a/src/namecache/namecache_api.c +++ b/src/namecache/namecache_api.c | |||
@@ -336,7 +336,7 @@ reconnect (struct GNUNET_NAMECACHE_Handle *h) | |||
336 | GNUNET_MQ_handler_end () | 336 | GNUNET_MQ_handler_end () |
337 | }; | 337 | }; |
338 | GNUNET_assert (NULL == h->mq); | 338 | GNUNET_assert (NULL == h->mq); |
339 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 339 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
340 | "namecache", | 340 | "namecache", |
341 | handlers, | 341 | handlers, |
342 | &mq_error_handler, | 342 | &mq_error_handler, |
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c index fd232de81..933ba7b95 100644 --- a/src/namestore/namestore_api.c +++ b/src/namestore/namestore_api.c | |||
@@ -806,7 +806,7 @@ reconnect (struct GNUNET_NAMESTORE_Handle *h) | |||
806 | struct GNUNET_NAMESTORE_QueueEntry *qe; | 806 | struct GNUNET_NAMESTORE_QueueEntry *qe; |
807 | 807 | ||
808 | GNUNET_assert (NULL == h->mq); | 808 | GNUNET_assert (NULL == h->mq); |
809 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 809 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
810 | "namestore", | 810 | "namestore", |
811 | handlers, | 811 | handlers, |
812 | &mq_error_handler, | 812 | &mq_error_handler, |
diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c index 00f0887d4..cd7c7dadb 100644 --- a/src/namestore/namestore_api_monitor.c +++ b/src/namestore/namestore_api_monitor.c | |||
@@ -262,7 +262,7 @@ reconnect (struct GNUNET_NAMESTORE_ZoneMonitor *zm) | |||
262 | GNUNET_MQ_destroy (zm->mq); | 262 | GNUNET_MQ_destroy (zm->mq); |
263 | zm->error_cb (zm->error_cb_cls); | 263 | zm->error_cb (zm->error_cb_cls); |
264 | } | 264 | } |
265 | zm->mq = GNUNET_CLIENT_connecT (zm->cfg, | 265 | zm->mq = GNUNET_CLIENT_connect (zm->cfg, |
266 | "namestore", | 266 | "namestore", |
267 | handlers, | 267 | handlers, |
268 | &mq_error_handler, | 268 | &mq_error_handler, |
diff --git a/src/nat-auto/gnunet-nat-auto_legacy.c b/src/nat-auto/gnunet-nat-auto_legacy.c index 803ff23e3..32f40c037 100644 --- a/src/nat-auto/gnunet-nat-auto_legacy.c +++ b/src/nat-auto/gnunet-nat-auto_legacy.c | |||
@@ -391,7 +391,7 @@ addr_cb (void *cls, | |||
391 | 391 | ||
392 | ca = GNUNET_new (struct ClientActivity); | 392 | ca = GNUNET_new (struct ClientActivity); |
393 | ca->h = h; | 393 | ca->h = h; |
394 | ca->mq = GNUNET_CLIENT_connecT (h->cfg, | 394 | ca->mq = GNUNET_CLIENT_connect (h->cfg, |
395 | "gnunet-nat-server", | 395 | "gnunet-nat-server", |
396 | NULL, | 396 | NULL, |
397 | &mq_error_handler, | 397 | &mq_error_handler, |
diff --git a/src/nat-auto/gnunet-service-nat-auto_legacy.c b/src/nat-auto/gnunet-service-nat-auto_legacy.c index 061d0cbe6..bcfa4b92b 100644 --- a/src/nat-auto/gnunet-service-nat-auto_legacy.c +++ b/src/nat-auto/gnunet-service-nat-auto_legacy.c | |||
@@ -670,7 +670,7 @@ test_nat_punched (struct GNUNET_NAT_AutoHandle *ah) | |||
670 | LOG (GNUNET_ERROR_TYPE_INFO, | 670 | LOG (GNUNET_ERROR_TYPE_INFO, |
671 | "Asking gnunet-nat-server to connect to `%s'\n", | 671 | "Asking gnunet-nat-server to connect to `%s'\n", |
672 | ah->stun_ip); | 672 | ah->stun_ip); |
673 | ah->mq = GNUNET_CLIENT_connecT (ah->cfg, | 673 | ah->mq = GNUNET_CLIENT_connect (ah->cfg, |
674 | "gnunet-nat-server", | 674 | "gnunet-nat-server", |
675 | NULL, | 675 | NULL, |
676 | &mq_error_handler, | 676 | &mq_error_handler, |
diff --git a/src/nat-auto/nat_auto_api.c b/src/nat-auto/nat_auto_api.c index 632561097..a5b41ac49 100644 --- a/src/nat-auto/nat_auto_api.c +++ b/src/nat-auto/nat_auto_api.c | |||
@@ -233,7 +233,7 @@ GNUNET_NAT_AUTO_autoconfig_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
233 | } | 233 | } |
234 | ah->arc = cb; | 234 | ah->arc = cb; |
235 | ah->arc_cls = cb_cls; | 235 | ah->arc_cls = cb_cls; |
236 | ah->mq = GNUNET_CLIENT_connecT (cfg, | 236 | ah->mq = GNUNET_CLIENT_connect (cfg, |
237 | "nat", | 237 | "nat", |
238 | handlers, | 238 | handlers, |
239 | &ah_error_handler, | 239 | &ah_error_handler, |
diff --git a/src/nat-auto/nat_auto_api_test.c b/src/nat-auto/nat_auto_api_test.c index df2d9fed3..8359e3cb5 100644 --- a/src/nat-auto/nat_auto_api_test.c +++ b/src/nat-auto/nat_auto_api_test.c | |||
@@ -390,7 +390,7 @@ addr_cb (void *cls, | |||
390 | 390 | ||
391 | ca = GNUNET_new (struct ClientActivity); | 391 | ca = GNUNET_new (struct ClientActivity); |
392 | ca->h = h; | 392 | ca->h = h; |
393 | ca->mq = GNUNET_CLIENT_connecT (h->cfg, | 393 | ca->mq = GNUNET_CLIENT_connect (h->cfg, |
394 | "gnunet-nat-server", | 394 | "gnunet-nat-server", |
395 | NULL, | 395 | NULL, |
396 | &mq_error_handler, | 396 | &mq_error_handler, |
diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c index 810d35649..eec5d3968 100644 --- a/src/nat/nat_api.c +++ b/src/nat/nat_api.c | |||
@@ -343,7 +343,7 @@ do_connect (void *cls) | |||
343 | struct GNUNET_MQ_Envelope *env; | 343 | struct GNUNET_MQ_Envelope *env; |
344 | 344 | ||
345 | nh->reconnect_task = NULL; | 345 | nh->reconnect_task = NULL; |
346 | nh->mq = GNUNET_CLIENT_connecT (nh->cfg, | 346 | nh->mq = GNUNET_CLIENT_connect (nh->cfg, |
347 | "nat", | 347 | "nat", |
348 | handlers, | 348 | handlers, |
349 | &mq_error_handler, | 349 | &mq_error_handler, |
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index 511f95514..4d54a740b 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c | |||
@@ -1346,7 +1346,7 @@ shutdown_task (void *cls) | |||
1346 | } | 1346 | } |
1347 | if (NULL != core_api) | 1347 | if (NULL != core_api) |
1348 | { | 1348 | { |
1349 | GNUNET_CORE_disconnecT (core_api); | 1349 | GNUNET_CORE_disconnect (core_api); |
1350 | core_api = NULL; | 1350 | core_api = NULL; |
1351 | } | 1351 | } |
1352 | if (NULL != stats) | 1352 | if (NULL != stats) |
@@ -1607,7 +1607,7 @@ run (void *cls, | |||
1607 | GNUNET_YES); | 1607 | GNUNET_YES); |
1608 | nc = GNUNET_notification_context_create (1); | 1608 | nc = GNUNET_notification_context_create (1); |
1609 | /* Connect to core service and register core handlers */ | 1609 | /* Connect to core service and register core handlers */ |
1610 | core_api = GNUNET_CORE_connecT (cfg, /* Main configuration */ | 1610 | core_api = GNUNET_CORE_connect (cfg, /* Main configuration */ |
1611 | NULL, /* Closure passed to functions */ | 1611 | NULL, /* Closure passed to functions */ |
1612 | &core_init, /* Call core_init once connected */ | 1612 | &core_init, /* Call core_init once connected */ |
1613 | &handle_core_connect, /* Handle connects */ | 1613 | &handle_core_connect, /* Handle connects */ |
diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c index cfe5482eb..d50b0214a 100644 --- a/src/nse/nse_api.c +++ b/src/nse/nse_api.c | |||
@@ -150,7 +150,7 @@ reconnect (void *cls) | |||
150 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 150 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
151 | "Connecting to network size estimation service.\n"); | 151 | "Connecting to network size estimation service.\n"); |
152 | GNUNET_assert (NULL == h->mq); | 152 | GNUNET_assert (NULL == h->mq); |
153 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 153 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
154 | "nse", | 154 | "nse", |
155 | handlers, | 155 | handlers, |
156 | &mq_error_handler, | 156 | &mq_error_handler, |
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c index 3080fb503..10729f3d0 100644 --- a/src/peerinfo/peerinfo_api.c +++ b/src/peerinfo/peerinfo_api.c | |||
@@ -462,7 +462,7 @@ reconnect (struct GNUNET_PEERINFO_Handle *h) | |||
462 | GNUNET_MQ_destroy (h->mq); | 462 | GNUNET_MQ_destroy (h->mq); |
463 | h->mq = NULL; | 463 | h->mq = NULL; |
464 | } | 464 | } |
465 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 465 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
466 | "peerinfo", | 466 | "peerinfo", |
467 | handlers, | 467 | handlers, |
468 | &mq_error_handler, | 468 | &mq_error_handler, |
diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c index e707a911e..ce226d96e 100644 --- a/src/peerinfo/peerinfo_api_notify.c +++ b/src/peerinfo/peerinfo_api_notify.c | |||
@@ -212,7 +212,7 @@ reconnect (void *cls) | |||
212 | struct NotifyMessage *nm; | 212 | struct NotifyMessage *nm; |
213 | 213 | ||
214 | nc->task = NULL; | 214 | nc->task = NULL; |
215 | nc->mq = GNUNET_CLIENT_connecT (nc->cfg, | 215 | nc->mq = GNUNET_CLIENT_connect (nc->cfg, |
216 | "peerinfo", | 216 | "peerinfo", |
217 | handlers, | 217 | handlers, |
218 | &mq_error_handler, | 218 | &mq_error_handler, |
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c index 47bf7775e..c9fcd17ab 100644 --- a/src/peerstore/peerstore_api.c +++ b/src/peerstore/peerstore_api.c | |||
@@ -829,7 +829,7 @@ reconnect (struct GNUNET_PEERSTORE_Handle *h) | |||
829 | GNUNET_MQ_destroy (h->mq); | 829 | GNUNET_MQ_destroy (h->mq); |
830 | h->mq = NULL; | 830 | h->mq = NULL; |
831 | } | 831 | } |
832 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 832 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
833 | "peerstore", | 833 | "peerstore", |
834 | mq_handlers, | 834 | mq_handlers, |
835 | &handle_client_error, | 835 | &handle_client_error, |
diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c index 9769bb853..d744e7d08 100644 --- a/src/psyc/psyc_api.c +++ b/src/psyc/psyc_api.c | |||
@@ -694,7 +694,7 @@ master_connect (struct GNUNET_PSYC_Master *mst) | |||
694 | GNUNET_MQ_handler_end () | 694 | GNUNET_MQ_handler_end () |
695 | }; | 695 | }; |
696 | 696 | ||
697 | chn->mq = GNUNET_CLIENT_connecT (chn->cfg, "psyc", | 697 | chn->mq = GNUNET_CLIENT_connect (chn->cfg, "psyc", |
698 | handlers, master_disconnected, mst); | 698 | handlers, master_disconnected, mst); |
699 | GNUNET_assert (NULL != chn->mq); | 699 | GNUNET_assert (NULL != chn->mq); |
700 | chn->tmit = GNUNET_PSYC_transmit_create (chn->mq); | 700 | chn->tmit = GNUNET_PSYC_transmit_create (chn->mq); |
@@ -993,7 +993,7 @@ slave_connect (struct GNUNET_PSYC_Slave *slv) | |||
993 | GNUNET_MQ_handler_end () | 993 | GNUNET_MQ_handler_end () |
994 | }; | 994 | }; |
995 | 995 | ||
996 | chn->mq = GNUNET_CLIENT_connecT (chn->cfg, "psyc", | 996 | chn->mq = GNUNET_CLIENT_connect (chn->cfg, "psyc", |
997 | handlers, slave_disconnected, slv); | 997 | handlers, slave_disconnected, slv); |
998 | GNUNET_assert (NULL != chn->mq); | 998 | GNUNET_assert (NULL != chn->mq); |
999 | chn->tmit = GNUNET_PSYC_transmit_create (chn->mq); | 999 | chn->tmit = GNUNET_PSYC_transmit_create (chn->mq); |
diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c index 480d594fc..40322662e 100644 --- a/src/psycstore/psycstore_api.c +++ b/src/psycstore/psycstore_api.c | |||
@@ -348,7 +348,7 @@ do_connect (struct GNUNET_PSYCSTORE_Handle *h) | |||
348 | 348 | ||
349 | h->op = GNUNET_OP_create (); | 349 | h->op = GNUNET_OP_create (); |
350 | GNUNET_assert (NULL == h->mq); | 350 | GNUNET_assert (NULL == h->mq); |
351 | h->mq = GNUNET_CLIENT_connecT (h->cfg, "psycstore", | 351 | h->mq = GNUNET_CLIENT_connect (h->cfg, "psycstore", |
352 | handlers, disconnected, h); | 352 | handlers, disconnected, h); |
353 | GNUNET_assert (NULL != h->mq); | 353 | GNUNET_assert (NULL != h->mq); |
354 | } | 354 | } |
diff --git a/src/regex/regex_api_announce.c b/src/regex/regex_api_announce.c index 8fded96d2..70bf34bc8 100644 --- a/src/regex/regex_api_announce.c +++ b/src/regex/regex_api_announce.c | |||
@@ -104,7 +104,7 @@ announce_reconnect (struct GNUNET_REGEX_Announcement *a) | |||
104 | struct AnnounceMessage *am; | 104 | struct AnnounceMessage *am; |
105 | size_t slen; | 105 | size_t slen; |
106 | 106 | ||
107 | a->mq = GNUNET_CLIENT_connecT (a->cfg, | 107 | a->mq = GNUNET_CLIENT_connect (a->cfg, |
108 | "regex", | 108 | "regex", |
109 | NULL, | 109 | NULL, |
110 | &announce_mq_error_handler, | 110 | &announce_mq_error_handler, |
diff --git a/src/regex/regex_api_search.c b/src/regex/regex_api_search.c index ff85f5748..b7a015f87 100644 --- a/src/regex/regex_api_search.c +++ b/src/regex/regex_api_search.c | |||
@@ -167,7 +167,7 @@ search_reconnect (struct GNUNET_REGEX_Search *s) | |||
167 | struct RegexSearchMessage *rsm; | 167 | struct RegexSearchMessage *rsm; |
168 | 168 | ||
169 | GNUNET_assert (NULL == s->mq); | 169 | GNUNET_assert (NULL == s->mq); |
170 | s->mq = GNUNET_CLIENT_connecT (s->cfg, | 170 | s->mq = GNUNET_CLIENT_connect (s->cfg, |
171 | "regex", | 171 | "regex", |
172 | handlers, | 172 | handlers, |
173 | &mq_error_handler, | 173 | &mq_error_handler, |
diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c index ad3253548..2965808fa 100644 --- a/src/revocation/gnunet-service-revocation.c +++ b/src/revocation/gnunet-service-revocation.c | |||
@@ -670,7 +670,7 @@ shutdown_task (void *cls) | |||
670 | } | 670 | } |
671 | if (NULL != core_api) | 671 | if (NULL != core_api) |
672 | { | 672 | { |
673 | GNUNET_CORE_disconnecT (core_api); | 673 | GNUNET_CORE_disconnect (core_api); |
674 | core_api = NULL; | 674 | core_api = NULL; |
675 | } | 675 | } |
676 | if (NULL != stats) | 676 | if (NULL != stats) |
@@ -894,7 +894,7 @@ run (void *cls, | |||
894 | peers = GNUNET_CONTAINER_multipeermap_create (128, | 894 | peers = GNUNET_CONTAINER_multipeermap_create (128, |
895 | GNUNET_YES); | 895 | GNUNET_YES); |
896 | /* Connect to core service and register core handlers */ | 896 | /* Connect to core service and register core handlers */ |
897 | core_api = GNUNET_CORE_connecT (cfg, /* Main configuration */ | 897 | core_api = GNUNET_CORE_connect (cfg, /* Main configuration */ |
898 | NULL, /* Closure passed to functions */ | 898 | NULL, /* Closure passed to functions */ |
899 | &core_init, /* Call core_init once connected */ | 899 | &core_init, /* Call core_init once connected */ |
900 | &handle_core_connect, /* Handle connects */ | 900 | &handle_core_connect, /* Handle connects */ |
diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c index 8c00ac2ae..fde0296a4 100644 --- a/src/revocation/revocation_api.c +++ b/src/revocation/revocation_api.c | |||
@@ -125,7 +125,7 @@ GNUNET_REVOCATION_query (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
125 | struct QueryMessage *qm; | 125 | struct QueryMessage *qm; |
126 | struct GNUNET_MQ_Envelope *env; | 126 | struct GNUNET_MQ_Envelope *env; |
127 | 127 | ||
128 | q->mq = GNUNET_CLIENT_connecT (cfg, | 128 | q->mq = GNUNET_CLIENT_connect (cfg, |
129 | "revocation", | 129 | "revocation", |
130 | handlers, | 130 | handlers, |
131 | &query_mq_error_handler, | 131 | &query_mq_error_handler, |
@@ -283,7 +283,7 @@ GNUNET_REVOCATION_revoke (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
283 | return NULL; | 283 | return NULL; |
284 | } | 284 | } |
285 | 285 | ||
286 | h->mq = GNUNET_CLIENT_connecT (cfg, | 286 | h->mq = GNUNET_CLIENT_connect (cfg, |
287 | "revocation", | 287 | "revocation", |
288 | handlers, | 288 | handlers, |
289 | &revocation_mq_error_handler, | 289 | &revocation_mq_error_handler, |
diff --git a/src/revocation/test_revocation.c b/src/revocation/test_revocation.c index ba659d9d8..d3bbb879a 100644 --- a/src/revocation/test_revocation.c +++ b/src/revocation/test_revocation.c | |||
@@ -337,7 +337,7 @@ core_connect_adapter (void *cls, | |||
337 | struct TestPeer *me = cls; | 337 | struct TestPeer *me = cls; |
338 | 338 | ||
339 | me->cfg = cfg; | 339 | me->cfg = cfg; |
340 | me->ch = GNUNET_CORE_connecT (cfg, | 340 | me->ch = GNUNET_CORE_connect (cfg, |
341 | me, | 341 | me, |
342 | NULL, | 342 | NULL, |
343 | &connect_cb, | 343 | &connect_cb, |
@@ -356,7 +356,7 @@ core_disconnect_adapter (void *cls, | |||
356 | { | 356 | { |
357 | struct TestPeer *me = cls; | 357 | struct TestPeer *me = cls; |
358 | 358 | ||
359 | GNUNET_CORE_disconnecT (me->ch); | 359 | GNUNET_CORE_disconnect (me->ch); |
360 | me->ch = NULL; | 360 | me->ch = NULL; |
361 | } | 361 | } |
362 | 362 | ||
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c index 3d2f37359..504f28b92 100644 --- a/src/rps/rps_api.c +++ b/src/rps/rps_api.c | |||
@@ -286,7 +286,7 @@ reconnect (struct GNUNET_RPS_Handle *h) | |||
286 | 286 | ||
287 | if (NULL != h->mq) | 287 | if (NULL != h->mq) |
288 | GNUNET_MQ_destroy (h->mq); | 288 | GNUNET_MQ_destroy (h->mq); |
289 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 289 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
290 | "rps", | 290 | "rps", |
291 | mq_handlers, | 291 | mq_handlers, |
292 | &mq_error_handler, | 292 | &mq_error_handler, |
diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c index 9606851c8..df9f8d196 100644 --- a/src/scalarproduct/scalarproduct_api.c +++ b/src/scalarproduct/scalarproduct_api.c | |||
@@ -256,7 +256,7 @@ GNUNET_SCALARPRODUCT_accept_computation (const struct GNUNET_CONFIGURATION_Handl | |||
256 | h->response_proc = &process_status_message; | 256 | h->response_proc = &process_status_message; |
257 | h->cfg = cfg; | 257 | h->cfg = cfg; |
258 | h->key = *session_key; | 258 | h->key = *session_key; |
259 | h->mq = GNUNET_CLIENT_connecT (cfg, | 259 | h->mq = GNUNET_CLIENT_connect (cfg, |
260 | "scalarproduct-bob", | 260 | "scalarproduct-bob", |
261 | handlers, | 261 | handlers, |
262 | &mq_error_handler, | 262 | &mq_error_handler, |
@@ -408,7 +408,7 @@ GNUNET_SCALARPRODUCT_start_computation (const struct GNUNET_CONFIGURATION_Handle | |||
408 | if (GNUNET_SYSERR == check_unique (elements, | 408 | if (GNUNET_SYSERR == check_unique (elements, |
409 | element_count)) | 409 | element_count)) |
410 | return NULL; | 410 | return NULL; |
411 | h->mq = GNUNET_CLIENT_connecT (cfg, | 411 | h->mq = GNUNET_CLIENT_connect (cfg, |
412 | "scalarproduct-alice", | 412 | "scalarproduct-alice", |
413 | handlers, | 413 | handlers, |
414 | &mq_error_handler, | 414 | &mq_error_handler, |
diff --git a/src/secretsharing/secretsharing_api.c b/src/secretsharing/secretsharing_api.c index 78167b671..85df66c13 100644 --- a/src/secretsharing/secretsharing_api.c +++ b/src/secretsharing/secretsharing_api.c | |||
@@ -261,7 +261,7 @@ GNUNET_SECRETSHARING_create_session (const struct GNUNET_CONFIGURATION_Handle *c | |||
261 | struct GNUNET_MQ_Envelope *ev; | 261 | struct GNUNET_MQ_Envelope *ev; |
262 | struct GNUNET_SECRETSHARING_CreateMessage *msg; | 262 | struct GNUNET_SECRETSHARING_CreateMessage *msg; |
263 | 263 | ||
264 | s->mq = GNUNET_CLIENT_connecT (cfg, | 264 | s->mq = GNUNET_CLIENT_connect (cfg, |
265 | "secretsharing", | 265 | "secretsharing", |
266 | mq_handlers, | 266 | mq_handlers, |
267 | &handle_session_client_error, | 267 | &handle_session_client_error, |
@@ -348,7 +348,7 @@ GNUNET_SECRETSHARING_decrypt (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
348 | 348 | ||
349 | s->decrypt_cb = decrypt_cb; | 349 | s->decrypt_cb = decrypt_cb; |
350 | s->decrypt_cls = decrypt_cb_cls; | 350 | s->decrypt_cls = decrypt_cb_cls; |
351 | s->mq = GNUNET_CLIENT_connecT (cfg, | 351 | s->mq = GNUNET_CLIENT_connect (cfg, |
352 | "secretsharing", | 352 | "secretsharing", |
353 | mq_handlers, | 353 | mq_handlers, |
354 | &handle_decrypt_client_error, | 354 | &handle_decrypt_client_error, |
diff --git a/src/set/set_api.c b/src/set/set_api.c index 7a33b86ea..7a7267a33 100644 --- a/src/set/set_api.c +++ b/src/set/set_api.c | |||
@@ -586,7 +586,7 @@ create_internal (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
586 | struct GNUNET_SET_CopyLazyConnectMessage *copy_msg; | 586 | struct GNUNET_SET_CopyLazyConnectMessage *copy_msg; |
587 | 587 | ||
588 | set->cfg = cfg; | 588 | set->cfg = cfg; |
589 | set->mq = GNUNET_CLIENT_connecT (cfg, | 589 | set->mq = GNUNET_CLIENT_connect (cfg, |
590 | "set", | 590 | "set", |
591 | mq_handlers, | 591 | mq_handlers, |
592 | &handle_client_set_error, | 592 | &handle_client_set_error, |
@@ -914,7 +914,7 @@ listen_connect (void *cls) | |||
914 | 914 | ||
915 | lh->reconnect_task = NULL; | 915 | lh->reconnect_task = NULL; |
916 | GNUNET_assert (NULL == lh->mq); | 916 | GNUNET_assert (NULL == lh->mq); |
917 | lh->mq = GNUNET_CLIENT_connecT (lh->cfg, | 917 | lh->mq = GNUNET_CLIENT_connect (lh->cfg, |
918 | "set", | 918 | "set", |
919 | mq_handlers, | 919 | mq_handlers, |
920 | &handle_client_listener_error, | 920 | &handle_client_listener_error, |
diff --git a/src/social/social_api.c b/src/social/social_api.c index f78cb9a85..d96c93d8f 100644 --- a/src/social/social_api.c +++ b/src/social/social_api.c | |||
@@ -1195,7 +1195,7 @@ host_connect (struct GNUNET_SOCIAL_Host *hst) | |||
1195 | GNUNET_MQ_handler_end () | 1195 | GNUNET_MQ_handler_end () |
1196 | }; | 1196 | }; |
1197 | 1197 | ||
1198 | plc->mq = GNUNET_CLIENT_connecT (plc->cfg, "social", | 1198 | plc->mq = GNUNET_CLIENT_connect (plc->cfg, "social", |
1199 | handlers, host_disconnected, hst); | 1199 | handlers, host_disconnected, hst); |
1200 | GNUNET_assert (NULL != plc->mq); | 1200 | GNUNET_assert (NULL != plc->mq); |
1201 | plc->tmit = GNUNET_PSYC_transmit_create (plc->mq); | 1201 | plc->tmit = GNUNET_PSYC_transmit_create (plc->mq); |
@@ -1697,7 +1697,7 @@ guest_connect (struct GNUNET_SOCIAL_Guest *gst) | |||
1697 | GNUNET_MQ_handler_end () | 1697 | GNUNET_MQ_handler_end () |
1698 | }; | 1698 | }; |
1699 | 1699 | ||
1700 | plc->mq = GNUNET_CLIENT_connecT (plc->cfg, "social", | 1700 | plc->mq = GNUNET_CLIENT_connect (plc->cfg, "social", |
1701 | handlers, guest_disconnected, gst); | 1701 | handlers, guest_disconnected, gst); |
1702 | GNUNET_assert (NULL != plc->mq); | 1702 | GNUNET_assert (NULL != plc->mq); |
1703 | plc->tmit = GNUNET_PSYC_transmit_create (plc->mq); | 1703 | plc->tmit = GNUNET_PSYC_transmit_create (plc->mq); |
@@ -2597,7 +2597,7 @@ app_connect (struct GNUNET_SOCIAL_App *app) | |||
2597 | GNUNET_MQ_handler_end () | 2597 | GNUNET_MQ_handler_end () |
2598 | }; | 2598 | }; |
2599 | 2599 | ||
2600 | app->mq = GNUNET_CLIENT_connecT (app->cfg, "social", | 2600 | app->mq = GNUNET_CLIENT_connect (app->cfg, "social", |
2601 | handlers, app_disconnected, app); | 2601 | handlers, app_disconnected, app); |
2602 | GNUNET_assert (NULL != app->mq); | 2602 | GNUNET_assert (NULL != app->mq); |
2603 | GNUNET_MQ_send_copy (app->mq, app->connect_env); | 2603 | GNUNET_MQ_send_copy (app->mq, app->connect_env); |
diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c index bfa2da3b4..ad4453b2a 100644 --- a/src/statistics/statistics_api.c +++ b/src/statistics/statistics_api.c | |||
@@ -678,7 +678,7 @@ try_connect (struct GNUNET_STATISTICS_Handle *h) | |||
678 | return GNUNET_NO; | 678 | return GNUNET_NO; |
679 | if (NULL != h->mq) | 679 | if (NULL != h->mq) |
680 | return GNUNET_YES; | 680 | return GNUNET_YES; |
681 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 681 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
682 | "statistics", | 682 | "statistics", |
683 | handlers, | 683 | handlers, |
684 | &mq_error_handler, | 684 | &mq_error_handler, |
diff --git a/src/testbed-logger/testbed_logger_api.c b/src/testbed-logger/testbed_logger_api.c index 19a5d9b50..25494aed0 100644 --- a/src/testbed-logger/testbed_logger_api.c +++ b/src/testbed-logger/testbed_logger_api.c | |||
@@ -224,7 +224,7 @@ GNUNET_TESTBED_LOGGER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
224 | struct GNUNET_TESTBED_LOGGER_Handle *h; | 224 | struct GNUNET_TESTBED_LOGGER_Handle *h; |
225 | 225 | ||
226 | h = GNUNET_new (struct GNUNET_TESTBED_LOGGER_Handle); | 226 | h = GNUNET_new (struct GNUNET_TESTBED_LOGGER_Handle); |
227 | h->mq = GNUNET_CLIENT_connecT (cfg, | 227 | h->mq = GNUNET_CLIENT_connect (cfg, |
228 | "testbed-logger", | 228 | "testbed-logger", |
229 | NULL, | 229 | NULL, |
230 | &mq_error_handler, | 230 | &mq_error_handler, |
diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c b/src/testbed/gnunet-service-testbed_connectionpool.c index b0e369c6a..6bc744ba8 100644 --- a/src/testbed/gnunet-service-testbed_connectionpool.c +++ b/src/testbed/gnunet-service-testbed_connectionpool.c | |||
@@ -623,12 +623,12 @@ core_peer_connect_cb (void *cls, | |||
623 | 623 | ||
624 | 624 | ||
625 | /** | 625 | /** |
626 | * Function called after #GNUNET_CORE_connecT() has succeeded (or failed | 626 | * Function called after #GNUNET_CORE_connect() has succeeded (or failed |
627 | * for good). Note that the private key of the peer is intentionally | 627 | * for good). Note that the private key of the peer is intentionally |
628 | * not exposed here; if you need it, your process should try to read | 628 | * not exposed here; if you need it, your process should try to read |
629 | * the private key file directly (which should work if you are | 629 | * the private key file directly (which should work if you are |
630 | * authorized...). Implementations of this function must not call | 630 | * authorized...). Implementations of this function must not call |
631 | * #GNUNET_CORE_disconnecT() (other than by scheduling a new task to | 631 | * #GNUNET_CORE_disconnect() (other than by scheduling a new task to |
632 | * do this later). | 632 | * do this later). |
633 | * | 633 | * |
634 | * @param cls the #PooledConnection object | 634 | * @param cls the #PooledConnection object |
@@ -675,7 +675,7 @@ opstart_get_handle_core (void *cls) | |||
675 | LOG_DEBUG ("Opening a CORE connection to peer %u\n", | 675 | LOG_DEBUG ("Opening a CORE connection to peer %u\n", |
676 | entry->index); | 676 | entry->index); |
677 | entry->handle_core | 677 | entry->handle_core |
678 | = GNUNET_CORE_connecT (entry->cfg, | 678 | = GNUNET_CORE_connect (entry->cfg, |
679 | entry, /* closure */ | 679 | entry, /* closure */ |
680 | &core_startup_cb, /* core startup notify */ | 680 | &core_startup_cb, /* core startup notify */ |
681 | &core_peer_connect_cb, /* peer connect notify */ | 681 | &core_peer_connect_cb, /* peer connect notify */ |
@@ -697,7 +697,7 @@ oprelease_get_handle_core (void *cls) | |||
697 | 697 | ||
698 | if (NULL == entry->handle_core) | 698 | if (NULL == entry->handle_core) |
699 | return; | 699 | return; |
700 | GNUNET_CORE_disconnecT (entry->handle_core); | 700 | GNUNET_CORE_disconnect (entry->handle_core); |
701 | entry->handle_core = NULL; | 701 | entry->handle_core = NULL; |
702 | GNUNET_free_non_null (entry->peer_identity); | 702 | GNUNET_free_non_null (entry->peer_identity); |
703 | entry->peer_identity = NULL; | 703 | entry->peer_identity = NULL; |
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index ae40948b3..0e0a5da9c 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -1646,7 +1646,7 @@ GNUNET_TESTBED_controller_connect (struct GNUNET_TESTBED_Host *host, | |||
1646 | controller->cc_cls = cc_cls; | 1646 | controller->cc_cls = cc_cls; |
1647 | controller->event_mask = event_mask; | 1647 | controller->event_mask = event_mask; |
1648 | controller->cfg = GNUNET_CONFIGURATION_dup (cfg); | 1648 | controller->cfg = GNUNET_CONFIGURATION_dup (cfg); |
1649 | controller->mq = GNUNET_CLIENT_connecT (controller->cfg, | 1649 | controller->mq = GNUNET_CLIENT_connect (controller->cfg, |
1650 | "testbed", | 1650 | "testbed", |
1651 | handlers, | 1651 | handlers, |
1652 | &mq_error_handler, | 1652 | &mq_error_handler, |
diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c index 1679756a1..93698d4b7 100644 --- a/src/testbed/testbed_api_barriers.c +++ b/src/testbed/testbed_api_barriers.c | |||
@@ -215,7 +215,7 @@ GNUNET_TESTBED_barrier_wait (const char *name, | |||
215 | h->name = GNUNET_strdup (name); | 215 | h->name = GNUNET_strdup (name); |
216 | h->cb = cb; | 216 | h->cb = cb; |
217 | h->cb_cls = cb_cls; | 217 | h->cb_cls = cb_cls; |
218 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 218 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
219 | "testbed-barrier", | 219 | "testbed-barrier", |
220 | handlers, | 220 | handlers, |
221 | &mq_error_handler, | 221 | &mq_error_handler, |
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index 69f01e043..d48f07e71 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c | |||
@@ -902,7 +902,7 @@ process_peer (void *cls, | |||
902 | 902 | ||
903 | 903 | ||
904 | /** | 904 | /** |
905 | * Function called after #GNUNET_CORE_connecT has succeeded | 905 | * Function called after #GNUNET_CORE_connect has succeeded |
906 | * (or failed for good). | 906 | * (or failed for good). |
907 | * | 907 | * |
908 | * @param cls closure | 908 | * @param cls closure |
@@ -1101,7 +1101,7 @@ cleaning_task (void *cls) | |||
1101 | } | 1101 | } |
1102 | if (NULL != handle) | 1102 | if (NULL != handle) |
1103 | { | 1103 | { |
1104 | GNUNET_CORE_disconnecT (handle); | 1104 | GNUNET_CORE_disconnect (handle); |
1105 | handle = NULL; | 1105 | handle = NULL; |
1106 | } | 1106 | } |
1107 | whitelist_peers (); | 1107 | whitelist_peers (); |
@@ -1189,7 +1189,7 @@ run (void *cls, | |||
1189 | &blacklist_check, | 1189 | &blacklist_check, |
1190 | NULL); | 1190 | NULL); |
1191 | ats = GNUNET_ATS_connectivity_init (cfg); | 1191 | ats = GNUNET_ATS_connectivity_init (cfg); |
1192 | handle = GNUNET_CORE_connecT (cfg, | 1192 | handle = GNUNET_CORE_connect (cfg, |
1193 | NULL, | 1193 | NULL, |
1194 | &core_init, | 1194 | &core_init, |
1195 | &connect_notify, | 1195 | &connect_notify, |
diff --git a/src/transport/transport_api_address_to_string.c b/src/transport/transport_api_address_to_string.c index fd30230f7..b9c72dcb3 100644 --- a/src/transport/transport_api_address_to_string.c +++ b/src/transport/transport_api_address_to_string.c | |||
@@ -210,7 +210,7 @@ GNUNET_TRANSPORT_address_to_string (const struct GNUNET_CONFIGURATION_Handle *cf | |||
210 | } | 210 | } |
211 | alc->cb = aluc; | 211 | alc->cb = aluc; |
212 | alc->cb_cls = aluc_cls; | 212 | alc->cb_cls = aluc_cls; |
213 | alc->mq = GNUNET_CLIENT_connecT (cfg, | 213 | alc->mq = GNUNET_CLIENT_connect (cfg, |
214 | "transport", | 214 | "transport", |
215 | handlers, | 215 | handlers, |
216 | &mq_error_handler, | 216 | &mq_error_handler, |
diff --git a/src/transport/transport_api_blacklist.c b/src/transport/transport_api_blacklist.c index 4b758f9dc..7b1bf526e 100644 --- a/src/transport/transport_api_blacklist.c +++ b/src/transport/transport_api_blacklist.c | |||
@@ -132,7 +132,7 @@ reconnect (struct GNUNET_TRANSPORT_Blacklist *br) | |||
132 | 132 | ||
133 | if (NULL != br->mq) | 133 | if (NULL != br->mq) |
134 | GNUNET_MQ_destroy (br->mq); | 134 | GNUNET_MQ_destroy (br->mq); |
135 | br->mq = GNUNET_CLIENT_connecT (br->cfg, | 135 | br->mq = GNUNET_CLIENT_connect (br->cfg, |
136 | "transport", | 136 | "transport", |
137 | handlers, | 137 | handlers, |
138 | &mq_error_handler, | 138 | &mq_error_handler, |
diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c index de18a140c..a693cb889 100644 --- a/src/transport/transport_api_core.c +++ b/src/transport/transport_api_core.c | |||
@@ -805,7 +805,7 @@ reconnect (void *cls) | |||
805 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 805 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
806 | "Connecting to transport service.\n"); | 806 | "Connecting to transport service.\n"); |
807 | GNUNET_assert (NULL == h->mq); | 807 | GNUNET_assert (NULL == h->mq); |
808 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 808 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
809 | "transport", | 809 | "transport", |
810 | handlers, | 810 | handlers, |
811 | &mq_error_handler, | 811 | &mq_error_handler, |
diff --git a/src/transport/transport_api_hello_get.c b/src/transport/transport_api_hello_get.c index 9c3a3e786..c53dd7a9a 100644 --- a/src/transport/transport_api_hello_get.c +++ b/src/transport/transport_api_hello_get.c | |||
@@ -182,7 +182,7 @@ reconnect (void *cls) | |||
182 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 182 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
183 | "Connecting to transport service.\n"); | 183 | "Connecting to transport service.\n"); |
184 | GNUNET_assert (NULL == ghh->mq); | 184 | GNUNET_assert (NULL == ghh->mq); |
185 | ghh->mq = GNUNET_CLIENT_connecT (ghh->cfg, | 185 | ghh->mq = GNUNET_CLIENT_connect (ghh->cfg, |
186 | "transport", | 186 | "transport", |
187 | handlers, | 187 | handlers, |
188 | &mq_error_handler, | 188 | &mq_error_handler, |
diff --git a/src/transport/transport_api_manipulation.c b/src/transport/transport_api_manipulation.c index 6325354cb..fd5849a7e 100644 --- a/src/transport/transport_api_manipulation.c +++ b/src/transport/transport_api_manipulation.c | |||
@@ -121,7 +121,7 @@ reconnect (void *cls) | |||
121 | "Connecting to transport service.\n"); | 121 | "Connecting to transport service.\n"); |
122 | GNUNET_assert (NULL == h->mq); | 122 | GNUNET_assert (NULL == h->mq); |
123 | h->reconnecting = GNUNET_NO; | 123 | h->reconnecting = GNUNET_NO; |
124 | h->mq = GNUNET_CLIENT_connecT (h->cfg, | 124 | h->mq = GNUNET_CLIENT_connect (h->cfg, |
125 | "transport", | 125 | "transport", |
126 | handlers, | 126 | handlers, |
127 | &mq_error_handler, | 127 | &mq_error_handler, |
diff --git a/src/transport/transport_api_monitor_peers.c b/src/transport/transport_api_monitor_peers.c index 345f2ad60..38e6e0d7c 100644 --- a/src/transport/transport_api_monitor_peers.c +++ b/src/transport/transport_api_monitor_peers.c | |||
@@ -360,7 +360,7 @@ do_peer_connect (void *cls) | |||
360 | struct GNUNET_MQ_Envelope *env; | 360 | struct GNUNET_MQ_Envelope *env; |
361 | 361 | ||
362 | pal_ctx->reconnect_task = NULL; | 362 | pal_ctx->reconnect_task = NULL; |
363 | pal_ctx->mq = GNUNET_CLIENT_connecT (pal_ctx->cfg, | 363 | pal_ctx->mq = GNUNET_CLIENT_connect (pal_ctx->cfg, |
364 | "transport", | 364 | "transport", |
365 | handlers, | 365 | handlers, |
366 | &mq_error_handler, | 366 | &mq_error_handler, |
diff --git a/src/transport/transport_api_monitor_plugins.c b/src/transport/transport_api_monitor_plugins.c index 7547a3402..e81664c41 100644 --- a/src/transport/transport_api_monitor_plugins.c +++ b/src/transport/transport_api_monitor_plugins.c | |||
@@ -388,7 +388,7 @@ do_plugin_connect (void *cls) | |||
388 | struct GNUNET_MQ_Envelope *env; | 388 | struct GNUNET_MQ_Envelope *env; |
389 | 389 | ||
390 | pm->reconnect_task = NULL; | 390 | pm->reconnect_task = NULL; |
391 | pm->mq = GNUNET_CLIENT_connecT (pm->cfg, | 391 | pm->mq = GNUNET_CLIENT_connect (pm->cfg, |
392 | "transport", | 392 | "transport", |
393 | handlers, | 393 | handlers, |
394 | &mq_error_handler, | 394 | &mq_error_handler, |
diff --git a/src/transport/transport_api_offer_hello.c b/src/transport/transport_api_offer_hello.c index 951ab9ba4..e1dca14e3 100644 --- a/src/transport/transport_api_offer_hello.c +++ b/src/transport/transport_api_offer_hello.c | |||
@@ -104,7 +104,7 @@ GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
104 | GNUNET_free (ohh); | 104 | GNUNET_free (ohh); |
105 | return NULL; | 105 | return NULL; |
106 | } | 106 | } |
107 | ohh->mq = GNUNET_CLIENT_connecT (cfg, | 107 | ohh->mq = GNUNET_CLIENT_connect (cfg, |
108 | "transport", | 108 | "transport", |
109 | NULL, | 109 | NULL, |
110 | NULL, | 110 | NULL, |
diff --git a/src/util/client.c b/src/util/client.c index 337d06734..d06547daf 100644 --- a/src/util/client.c +++ b/src/util/client.c | |||
@@ -821,7 +821,7 @@ connection_client_cancel_impl (struct GNUNET_MQ_Handle *mq, | |||
821 | * @return the message queue, NULL on error | 821 | * @return the message queue, NULL on error |
822 | */ | 822 | */ |
823 | struct GNUNET_MQ_Handle * | 823 | struct GNUNET_MQ_Handle * |
824 | GNUNET_CLIENT_connecT (const struct GNUNET_CONFIGURATION_Handle *cfg, | 824 | GNUNET_CLIENT_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
825 | const char *service_name, | 825 | const char *service_name, |
826 | const struct GNUNET_MQ_MessageHandler *handlers, | 826 | const struct GNUNET_MQ_MessageHandler *handlers, |
827 | GNUNET_MQ_ErrorHandler error_handler, | 827 | GNUNET_MQ_ErrorHandler error_handler, |
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c index 481e99157..fdeaed006 100644 --- a/src/util/resolver_api.c +++ b/src/util/resolver_api.c | |||
@@ -735,7 +735,7 @@ reconnect_task (void *cls) | |||
735 | return; /* no work pending */ | 735 | return; /* no work pending */ |
736 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 736 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
737 | "Trying to connect to DNS service\n"); | 737 | "Trying to connect to DNS service\n"); |
738 | mq = GNUNET_CLIENT_connecT (resolver_cfg, | 738 | mq = GNUNET_CLIENT_connect (resolver_cfg, |
739 | "resolver", | 739 | "resolver", |
740 | handlers, | 740 | handlers, |
741 | &mq_error_handler, | 741 | &mq_error_handler, |
diff --git a/src/util/test_client.c b/src/util/test_client.c index aa4d84495..f60e5b7f7 100644 --- a/src/util/test_client.c +++ b/src/util/test_client.c | |||
@@ -98,12 +98,12 @@ task (void *cls, | |||
98 | 98 | ||
99 | /* test that ill-configured client fails instantly */ | 99 | /* test that ill-configured client fails instantly */ |
100 | GNUNET_assert (NULL == | 100 | GNUNET_assert (NULL == |
101 | GNUNET_CLIENT_connecT (cfg, | 101 | GNUNET_CLIENT_connect (cfg, |
102 | "invalid-service", | 102 | "invalid-service", |
103 | NULL, | 103 | NULL, |
104 | &mq_error_handler, | 104 | &mq_error_handler, |
105 | NULL)); | 105 | NULL)); |
106 | client_mq = GNUNET_CLIENT_connecT (cfg, | 106 | client_mq = GNUNET_CLIENT_connect (cfg, |
107 | "test_client", | 107 | "test_client", |
108 | chandlers, | 108 | chandlers, |
109 | &mq_error_handler, | 109 | &mq_error_handler, |
diff --git a/src/util/test_server.c b/src/util/test_server.c index eac45fc69..8003adbf4 100644 --- a/src/util/test_server.c +++ b/src/util/test_server.c | |||
@@ -267,7 +267,7 @@ task (void *cls) | |||
267 | "resolver", | 267 | "resolver", |
268 | "HOSTNAME", | 268 | "HOSTNAME", |
269 | "localhost"); | 269 | "localhost"); |
270 | mq = GNUNET_CLIENT_connecT (cfg, | 270 | mq = GNUNET_CLIENT_connect (cfg, |
271 | "test-server", | 271 | "test-server", |
272 | chandlers, | 272 | chandlers, |
273 | &mq_error_handler, | 273 | &mq_error_handler, |
diff --git a/src/util/test_server_disconnect.c b/src/util/test_server_disconnect.c index de9c4722d..c3d003e90 100644 --- a/src/util/test_server_disconnect.c +++ b/src/util/test_server_disconnect.c | |||
@@ -125,7 +125,7 @@ task (void *cls) | |||
125 | "localhost"); | 125 | "localhost"); |
126 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", | 126 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
127 | "localhost"); | 127 | "localhost"); |
128 | mq = GNUNET_CLIENT_connecT (cfg, | 128 | mq = GNUNET_CLIENT_connect (cfg, |
129 | "test-server", | 129 | "test-server", |
130 | NULL, | 130 | NULL, |
131 | NULL, | 131 | NULL, |
diff --git a/src/util/test_server_with_client.c b/src/util/test_server_with_client.c index 59f9b6afd..63bfda00c 100644 --- a/src/util/test_server_with_client.c +++ b/src/util/test_server_with_client.c | |||
@@ -166,7 +166,7 @@ task (void *cls) | |||
166 | GNUNET_CONFIGURATION_set_value_string (cfg, "test", "HOSTNAME", "localhost"); | 166 | GNUNET_CONFIGURATION_set_value_string (cfg, "test", "HOSTNAME", "localhost"); |
167 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", | 167 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
168 | "localhost"); | 168 | "localhost"); |
169 | mq = GNUNET_CLIENT_connecT (cfg, | 169 | mq = GNUNET_CLIENT_connect (cfg, |
170 | "test", | 170 | "test", |
171 | NULL, | 171 | NULL, |
172 | NULL, | 172 | NULL, |
diff --git a/src/util/test_server_with_client_unix.c b/src/util/test_server_with_client_unix.c index ef48aabce..d240f1a88 100644 --- a/src/util/test_server_with_client_unix.c +++ b/src/util/test_server_with_client_unix.c | |||
@@ -144,7 +144,7 @@ task (void *cls) | |||
144 | GNUNET_CONFIGURATION_set_value_string (cfg, "test", "UNIXPATH", unixpath); | 144 | GNUNET_CONFIGURATION_set_value_string (cfg, "test", "UNIXPATH", unixpath); |
145 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", | 145 | GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", |
146 | "localhost"); | 146 | "localhost"); |
147 | mq = GNUNET_CLIENT_connecT (cfg, | 147 | mq = GNUNET_CLIENT_connect (cfg, |
148 | "test", | 148 | "test", |
149 | NULL, | 149 | NULL, |
150 | NULL, | 150 | NULL, |
diff --git a/src/util/test_service.c b/src/util/test_service.c index dc9d16ed9..d2136b42f 100644 --- a/src/util/test_service.c +++ b/src/util/test_service.c | |||
@@ -107,7 +107,7 @@ service_init (void *cls, | |||
107 | struct GNUNET_MQ_Envelope *env; | 107 | struct GNUNET_MQ_Envelope *env; |
108 | struct GNUNET_MessageHeader *msg; | 108 | struct GNUNET_MessageHeader *msg; |
109 | 109 | ||
110 | mq = GNUNET_CLIENT_connecT (cfg, | 110 | mq = GNUNET_CLIENT_connect (cfg, |
111 | service_name, | 111 | service_name, |
112 | NULL, | 112 | NULL, |
113 | NULL, | 113 | NULL, |
diff --git a/src/util/test_socks.c b/src/util/test_socks.c index 416f32f62..cb70f916f 100644 --- a/src/util/test_socks.c +++ b/src/util/test_socks.c | |||
@@ -160,7 +160,7 @@ task (void *cls) | |||
160 | handlers[0].callback_cls = cls; | 160 | handlers[0].callback_cls = cls; |
161 | handlers[1].callback_cls = cls; | 161 | handlers[1].callback_cls = cls; |
162 | GNUNET_SERVER_add_handlers (server, handlers); | 162 | GNUNET_SERVER_add_handlers (server, handlers); |
163 | mq = GNUNET_CLIENT_connecT (cfg, | 163 | mq = GNUNET_CLIENT_connect (cfg, |
164 | MYNAME, | 164 | MYNAME, |
165 | chandlers, | 165 | chandlers, |
166 | &mq_error_handler, | 166 | &mq_error_handler, |
diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c index 4add41ce4..bc77865a8 100644 --- a/src/vpn/vpn_api.c +++ b/src/vpn/vpn_api.c | |||
@@ -324,7 +324,7 @@ connect_task (void *cls) | |||
324 | struct GNUNET_VPN_RedirectionRequest *rr; | 324 | struct GNUNET_VPN_RedirectionRequest *rr; |
325 | 325 | ||
326 | vh->rt = NULL; | 326 | vh->rt = NULL; |
327 | vh->mq = GNUNET_CLIENT_connecT (vh->cfg, | 327 | vh->mq = GNUNET_CLIENT_connect (vh->cfg, |
328 | "vpn", | 328 | "vpn", |
329 | handlers, | 329 | handlers, |
330 | &mq_error_handler, | 330 | &mq_error_handler, |