diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-10 17:38:29 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-10 17:38:29 +0100 |
commit | bf5f92d9429a556f68c950df7be3dc25907e0d6c (patch) | |
tree | 640b74c6a12a53ccac9925eb05b9e6d644d7e748 /src/hostlist | |
parent | 06c0c503acd9d523d4d18eeac862222a744db2ab (diff) | |
download | gnunet-bf5f92d9429a556f68c950df7be3dc25907e0d6c.tar.gz gnunet-bf5f92d9429a556f68c950df7be3dc25907e0d6c.zip |
rename connecT -> connect now that the old API is dead
Diffstat (limited to 'src/hostlist')
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist.c | 10 | ||||
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist_client.c | 4 | ||||
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist_client.h | 4 | ||||
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist_server.c | 2 | ||||
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist_server.h | 2 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_learning.c | 6 |
6 files changed, 14 insertions, 14 deletions
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, |