diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-11-04 14:00:32 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-11-04 14:00:32 +0000 |
commit | 83b19539f4d322b43683f5838b72e9ec2c8e6073 (patch) | |
tree | d0ab9329fcbefe360d9d14e2ace21a6b3396dfe9 /src/dht/gnunet-service-dht.c | |
parent | 28a2eb43281a1f08a67954f07beb9af3a9bc9a35 (diff) | |
download | gnunet-83b19539f4d322b43683f5838b72e9ec2c8e6073.tar.gz gnunet-83b19539f4d322b43683f5838b72e9ec2c8e6073.zip |
curly wars / auto-indentation
Diffstat (limited to 'src/dht/gnunet-service-dht.c')
-rw-r--r-- | src/dht/gnunet-service-dht.c | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index 3e0f3c8d9..72575acae 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c | |||
@@ -81,8 +81,7 @@ static struct GNUNET_TRANSPORT_GetHelloHandle *ghh; | |||
81 | * @param message HELLO message of peer | 81 | * @param message HELLO message of peer |
82 | */ | 82 | */ |
83 | static void | 83 | static void |
84 | process_hello (void *cls, | 84 | process_hello (void *cls, const struct GNUNET_MessageHeader *message) |
85 | const struct GNUNET_MessageHeader *message) | ||
86 | { | 85 | { |
87 | GNUNET_assert (message != NULL); | 86 | GNUNET_assert (message != NULL); |
88 | GNUNET_free_non_null (GDS_my_hello); | 87 | GNUNET_free_non_null (GDS_my_hello); |
@@ -149,24 +148,22 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
149 | GDS_DATACACHE_init (); | 148 | GDS_DATACACHE_init (); |
150 | GDS_HELLO_init (); | 149 | GDS_HELLO_init (); |
151 | GDS_CLIENTS_init (server); | 150 | GDS_CLIENTS_init (server); |
152 | if (GNUNET_OK != | 151 | if (GNUNET_OK != GDS_NEIGHBOURS_init ()) |
153 | GDS_NEIGHBOURS_init ()) | 152 | { |
154 | { | 153 | shutdown_task (NULL, NULL); |
155 | shutdown_task (NULL, NULL); | 154 | return; |
156 | return; | 155 | } |
157 | } | 156 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, |
158 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 157 | NULL); |
159 | &shutdown_task, NULL); | ||
160 | GDS_transport_handle = | 158 | GDS_transport_handle = |
161 | GNUNET_TRANSPORT_connect (GDS_cfg, NULL, NULL, NULL, NULL, NULL); | 159 | GNUNET_TRANSPORT_connect (GDS_cfg, NULL, NULL, NULL, NULL, NULL); |
162 | if (GDS_transport_handle == NULL) | 160 | if (GDS_transport_handle == NULL) |
163 | { | 161 | { |
164 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 162 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
165 | _("Failed to connect to transport service!\n")); | 163 | _("Failed to connect to transport service!\n")); |
166 | return; | 164 | return; |
167 | } | 165 | } |
168 | ghh = GNUNET_TRANSPORT_get_hello (GDS_transport_handle, | 166 | ghh = GNUNET_TRANSPORT_get_hello (GDS_transport_handle, &process_hello, NULL); |
169 | &process_hello, NULL); | ||
170 | } | 167 | } |
171 | 168 | ||
172 | 169 | ||
@@ -181,12 +178,11 @@ int | |||
181 | main (int argc, char *const *argv) | 178 | main (int argc, char *const *argv) |
182 | { | 179 | { |
183 | int ret; | 180 | int ret; |
184 | 181 | ||
185 | ret = (GNUNET_OK == | 182 | ret = |
186 | GNUNET_SERVICE_run (argc, argv, | 183 | (GNUNET_OK == |
187 | "dht", | 184 | GNUNET_SERVICE_run (argc, argv, "dht", GNUNET_SERVICE_OPTION_NONE, &run, |
188 | GNUNET_SERVICE_OPTION_NONE, | 185 | NULL)) ? 0 : 1; |
189 | &run, NULL)) ? 0 : 1; | ||
190 | GDS_CLIENTS_done (); | 186 | GDS_CLIENTS_done (); |
191 | return ret; | 187 | return ret; |
192 | } | 188 | } |