diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-07-26 21:12:56 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-07-26 21:12:56 +0000 |
commit | 8c2dc7d19810d58f23c43bf900e2fb3eebe06fed (patch) | |
tree | 9173a966e2f51a34d9259a0126484e05d44dcaac /src/core/gnunet-service-core.c | |
parent | a89ea716333ad5ad43757a946efc01cb5e95a0c0 (diff) | |
download | gnunet-8c2dc7d19810d58f23c43bf900e2fb3eebe06fed.tar.gz gnunet-8c2dc7d19810d58f23c43bf900e2fb3eebe06fed.zip |
-converting CORE service to new transport MQ API
Diffstat (limited to 'src/core/gnunet-service-core.c')
-rw-r--r-- | src/core/gnunet-service-core.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 70b83b24c..f9391e616 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "gnunet-service-core.h" | 29 | #include "gnunet-service-core.h" |
30 | #include "gnunet-service-core_clients.h" | 30 | #include "gnunet-service-core_clients.h" |
31 | #include "gnunet-service-core_kx.h" | 31 | #include "gnunet-service-core_kx.h" |
32 | #include "gnunet-service-core_neighbours.h" | ||
33 | #include "gnunet-service-core_sessions.h" | 32 | #include "gnunet-service-core_sessions.h" |
34 | #include "gnunet-service-core_typemap.h" | 33 | #include "gnunet-service-core_typemap.h" |
35 | 34 | ||
@@ -67,13 +66,13 @@ shutdown_task (void *cls) | |||
67 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 66 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
68 | "Core service shutting down.\n"); | 67 | "Core service shutting down.\n"); |
69 | GSC_CLIENTS_done (); | 68 | GSC_CLIENTS_done (); |
70 | GSC_NEIGHBOURS_done (); | ||
71 | GSC_SESSIONS_done (); | 69 | GSC_SESSIONS_done (); |
72 | GSC_KX_done (); | 70 | GSC_KX_done (); |
73 | GSC_TYPEMAP_done (); | 71 | GSC_TYPEMAP_done (); |
74 | if (NULL != GSC_stats) | 72 | if (NULL != GSC_stats) |
75 | { | 73 | { |
76 | GNUNET_STATISTICS_destroy (GSC_stats, GNUNET_NO); | 74 | GNUNET_STATISTICS_destroy (GSC_stats, |
75 | GNUNET_NO); | ||
77 | GSC_stats = NULL; | 76 | GSC_stats = NULL; |
78 | } | 77 | } |
79 | GSC_cfg = NULL; | 78 | GSC_cfg = NULL; |
@@ -88,7 +87,8 @@ shutdown_task (void *cls) | |||
88 | * @param c configuration to use | 87 | * @param c configuration to use |
89 | */ | 88 | */ |
90 | static void | 89 | static void |
91 | run (void *cls, struct GNUNET_SERVER_Handle *server, | 90 | run (void *cls, |
91 | struct GNUNET_SERVER_Handle *server, | ||
92 | const struct GNUNET_CONFIGURATION_Handle *c) | 92 | const struct GNUNET_CONFIGURATION_Handle *c) |
93 | { | 93 | { |
94 | struct GNUNET_CRYPTO_EddsaPrivateKey *pk; | 94 | struct GNUNET_CRYPTO_EddsaPrivateKey *pk; |
@@ -97,7 +97,9 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
97 | GSC_cfg = c; | 97 | GSC_cfg = c; |
98 | GSC_server = server; | 98 | GSC_server = server; |
99 | if (GNUNET_OK != | 99 | if (GNUNET_OK != |
100 | GNUNET_CONFIGURATION_get_value_filename (GSC_cfg, "PEER", "PRIVATE_KEY", | 100 | GNUNET_CONFIGURATION_get_value_filename (GSC_cfg, |
101 | "PEER", | ||
102 | "PRIVATE_KEY", | ||
101 | &keyfile)) | 103 | &keyfile)) |
102 | { | 104 | { |
103 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 105 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
@@ -105,7 +107,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
105 | GNUNET_SCHEDULER_shutdown (); | 107 | GNUNET_SCHEDULER_shutdown (); |
106 | return; | 108 | return; |
107 | } | 109 | } |
108 | GSC_stats = GNUNET_STATISTICS_create ("core", GSC_cfg); | 110 | GSC_stats = GNUNET_STATISTICS_create ("core", |
111 | GSC_cfg); | ||
109 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, | 112 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, |
110 | NULL); | 113 | NULL); |
111 | GNUNET_SERVER_suspend (server); | 114 | GNUNET_SERVER_suspend (server); |
@@ -113,9 +116,8 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
113 | pk = GNUNET_CRYPTO_eddsa_key_create_from_file (keyfile); | 116 | pk = GNUNET_CRYPTO_eddsa_key_create_from_file (keyfile); |
114 | GNUNET_free (keyfile); | 117 | GNUNET_free (keyfile); |
115 | GNUNET_assert (NULL != pk); | 118 | GNUNET_assert (NULL != pk); |
116 | if ((GNUNET_OK != GSC_KX_init (pk, | 119 | if (GNUNET_OK != GSC_KX_init (pk, |
117 | server)) || | 120 | server)) |
118 | (GNUNET_OK != GSC_NEIGHBOURS_init ())) | ||
119 | { | 121 | { |
120 | GNUNET_SCHEDULER_shutdown (); | 122 | GNUNET_SCHEDULER_shutdown (); |
121 | return; | 123 | return; |
@@ -124,7 +126,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
124 | GSC_CLIENTS_init (GSC_server); | 126 | GSC_CLIENTS_init (GSC_server); |
125 | GNUNET_SERVER_resume (GSC_server); | 127 | GNUNET_SERVER_resume (GSC_server); |
126 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 128 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
127 | _("Core service of `%4s' ready.\n"), | 129 | _("Core service of `%s' ready.\n"), |
128 | GNUNET_i2s (&GSC_my_identity)); | 130 | GNUNET_i2s (&GSC_my_identity)); |
129 | } | 131 | } |
130 | 132 | ||