diff options
author | Gabor X Toth <*@tg-x.net> | 2016-08-03 23:20:34 +0000 |
---|---|---|
committer | Gabor X Toth <*@tg-x.net> | 2016-08-03 23:20:34 +0000 |
commit | b2cada934a6811b7fbc2a9d1a9bf84d48a2ba0e1 (patch) | |
tree | 1167b1e57923e6caca16f990f67acb05c600f93e /src | |
parent | c5f879125f1c842f679b2c8e95341f3c1d3aa184 (diff) | |
download | gnunet-b2cada934a6811b7fbc2a9d1a9bf84d48a2ba0e1.tar.gz gnunet-b2cada934a6811b7fbc2a9d1a9bf84d48a2ba0e1.zip |
multicast,psyc,social: use CORE_connecT()
Diffstat (limited to 'src')
-rw-r--r-- | src/multicast/gnunet-service-multicast.c | 5 | ||||
-rw-r--r-- | src/multicast/test_multicast.c | 9 | ||||
-rw-r--r-- | src/psyc/test_psyc.c | 5 | ||||
-rw-r--r-- | src/social/gnunet-service-social.c | 5 | ||||
-rw-r--r-- | src/social/gnunet-social.c | 5 | ||||
-rw-r--r-- | src/social/test_social.c | 5 |
6 files changed, 13 insertions, 21 deletions
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index a14ecd04c..04146a99b 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c | |||
@@ -333,7 +333,7 @@ shutdown_task (void *cls) | |||
333 | { | 333 | { |
334 | if (NULL != core) | 334 | if (NULL != core) |
335 | { | 335 | { |
336 | GNUNET_CORE_disconnect (core); | 336 | GNUNET_CORE_disconnecT (core); |
337 | core = NULL; | 337 | core = NULL; |
338 | } | 338 | } |
339 | if (NULL != cadet) | 339 | if (NULL != cadet) |
@@ -1859,8 +1859,7 @@ run (void *cls, | |||
1859 | cfg = c; | 1859 | cfg = c; |
1860 | server = srv; | 1860 | server = srv; |
1861 | GNUNET_SERVER_connect_notify (server, &client_notify_connect, NULL); | 1861 | GNUNET_SERVER_connect_notify (server, &client_notify_connect, NULL); |
1862 | core = GNUNET_CORE_connect (cfg, NULL, &core_connected_cb, NULL, NULL, | 1862 | core = GNUNET_CORE_connecT (cfg, NULL, &core_connected_cb, NULL, NULL, NULL); |
1863 | NULL, GNUNET_NO, NULL, GNUNET_NO, NULL); | ||
1864 | } | 1863 | } |
1865 | 1864 | ||
1866 | 1865 | ||
diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c index 9b26f9af0..fd8c16670 100644 --- a/src/multicast/test_multicast.c +++ b/src/multicast/test_multicast.c | |||
@@ -112,7 +112,7 @@ cleanup () | |||
112 | { | 112 | { |
113 | if (NULL != core) | 113 | if (NULL != core) |
114 | { | 114 | { |
115 | GNUNET_CORE_disconnect (core); | 115 | GNUNET_CORE_disconnecT (core); |
116 | core = NULL; | 116 | core = NULL; |
117 | } | 117 | } |
118 | if (NULL != member) | 118 | if (NULL != member) |
@@ -713,11 +713,8 @@ run (void *cls, | |||
713 | cfg = c; | 713 | cfg = c; |
714 | end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, | 714 | end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, |
715 | &end_badly, NULL); | 715 | &end_badly, NULL); |
716 | core = GNUNET_CORE_connect (cfg, NULL, | 716 | core = GNUNET_CORE_connecT (cfg, NULL, |
717 | &core_connected, NULL, NULL, | 717 | &core_connected, NULL, NULL, NULL); |
718 | NULL, GNUNET_NO, | ||
719 | NULL, GNUNET_NO, | ||
720 | NULL); | ||
721 | } | 718 | } |
722 | 719 | ||
723 | 720 | ||
diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c index 7d39d8031..4bcf90fc9 100644 --- a/src/psyc/test_psyc.c +++ b/src/psyc/test_psyc.c | |||
@@ -145,7 +145,7 @@ cleanup () | |||
145 | { | 145 | { |
146 | if (NULL != core) | 146 | if (NULL != core) |
147 | { | 147 | { |
148 | GNUNET_CORE_disconnect (core); | 148 | GNUNET_CORE_disconnecT (core); |
149 | core = NULL; | 149 | core = NULL; |
150 | } | 150 | } |
151 | if (NULL != slv) | 151 | if (NULL != slv) |
@@ -988,8 +988,7 @@ run (void *cls, | |||
988 | GNUNET_CRYPTO_eddsa_key_get_public (channel_key, &channel_pub_key); | 988 | GNUNET_CRYPTO_eddsa_key_get_public (channel_key, &channel_pub_key); |
989 | GNUNET_CRYPTO_ecdsa_key_get_public (slave_key, &slave_pub_key); | 989 | GNUNET_CRYPTO_ecdsa_key_get_public (slave_key, &slave_pub_key); |
990 | 990 | ||
991 | core = GNUNET_CORE_connect (cfg, NULL, &core_connected, NULL, NULL, | 991 | core = GNUNET_CORE_connecT (cfg, NULL, &core_connected, NULL, NULL, NULL); |
992 | NULL, GNUNET_NO, NULL, GNUNET_NO, NULL); | ||
993 | } | 992 | } |
994 | 993 | ||
995 | 994 | ||
diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c index afcd59b5d..14c457531 100644 --- a/src/social/gnunet-service-social.c +++ b/src/social/gnunet-service-social.c | |||
@@ -456,7 +456,7 @@ shutdown_task (void *cls) | |||
456 | } | 456 | } |
457 | if (NULL != core) | 457 | if (NULL != core) |
458 | { | 458 | { |
459 | GNUNET_CORE_disconnect (core); | 459 | GNUNET_CORE_disconnecT (core); |
460 | core = NULL; | 460 | core = NULL; |
461 | } | 461 | } |
462 | if (NULL != id) | 462 | if (NULL != id) |
@@ -3500,8 +3500,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
3500 | apps_places = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_NO); | 3500 | apps_places = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_NO); |
3501 | places_apps = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_NO); | 3501 | places_apps = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_NO); |
3502 | 3502 | ||
3503 | core = GNUNET_CORE_connect (cfg, NULL, core_connected, NULL, NULL, | 3503 | core = GNUNET_CORE_connecT (cfg, NULL, core_connected, NULL, NULL, NULL); |
3504 | NULL, GNUNET_NO, NULL, GNUNET_NO, NULL); | ||
3505 | id = GNUNET_IDENTITY_connect (cfg, &identity_recv_ego, NULL); | 3504 | id = GNUNET_IDENTITY_connect (cfg, &identity_recv_ego, NULL); |
3506 | gns = GNUNET_GNS_connect (cfg); | 3505 | gns = GNUNET_GNS_connect (cfg); |
3507 | namestore = GNUNET_NAMESTORE_connect (cfg); | 3506 | namestore = GNUNET_NAMESTORE_connect (cfg); |
diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c index 39ebff442..98a48c294 100644 --- a/src/social/gnunet-social.c +++ b/src/social/gnunet-social.c | |||
@@ -1086,7 +1086,7 @@ app_recv_ego (void *cls, | |||
1086 | static void | 1086 | static void |
1087 | app_connect (void *cls) | 1087 | app_connect (void *cls) |
1088 | { | 1088 | { |
1089 | GNUNET_CORE_disconnect (core); | 1089 | GNUNET_CORE_disconnecT (core); |
1090 | core = NULL; | 1090 | core = NULL; |
1091 | 1091 | ||
1092 | app = GNUNET_SOCIAL_app_connect (cfg, opt_app, | 1092 | app = GNUNET_SOCIAL_app_connect (cfg, opt_app, |
@@ -1181,8 +1181,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
1181 | } | 1181 | } |
1182 | } | 1182 | } |
1183 | 1183 | ||
1184 | core = GNUNET_CORE_connect (cfg, NULL, &core_connected, NULL, NULL, | 1184 | core = GNUNET_CORE_connecT (cfg, NULL, &core_connected, NULL, NULL, NULL); |
1185 | NULL, GNUNET_NO, NULL, GNUNET_NO, NULL); | ||
1186 | } | 1185 | } |
1187 | 1186 | ||
1188 | 1187 | ||
diff --git a/src/social/test_social.c b/src/social/test_social.c index 406f5cb67..71519bf59 100644 --- a/src/social/test_social.c +++ b/src/social/test_social.c | |||
@@ -187,7 +187,7 @@ cleanup () | |||
187 | { | 187 | { |
188 | if (NULL != core) | 188 | if (NULL != core) |
189 | { | 189 | { |
190 | GNUNET_CORE_disconnect (core); | 190 | GNUNET_CORE_disconnecT (core); |
191 | core = NULL; | 191 | core = NULL; |
192 | } | 192 | } |
193 | 193 | ||
@@ -1332,8 +1332,7 @@ run (void *cls, | |||
1332 | end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, | 1332 | end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, |
1333 | &end_badly, NULL); | 1333 | &end_badly, NULL); |
1334 | 1334 | ||
1335 | core = GNUNET_CORE_connect (cfg, NULL, &core_connected, NULL, NULL, | 1335 | core = GNUNET_CORE_connecT (cfg, NULL, &core_connected, NULL, NULL, NULL); |
1336 | NULL, GNUNET_NO, NULL, GNUNET_NO, NULL); | ||
1337 | } | 1336 | } |
1338 | 1337 | ||
1339 | 1338 | ||