aboutsummaryrefslogtreecommitdiff
path: root/src/util/server.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2009-11-08 21:31:27 +0000
committerChristian Grothoff <christian@grothoff.org>2009-11-08 21:31:27 +0000
commit024450ec8ac7d00b5c7c830d34ee1843b6c3a753 (patch)
treef5f8e91f837474ef4bca22f91672a3b14a606787 /src/util/server.c
parentbb82fb7f4ea781b843f032c6869f98e6fa6fa107 (diff)
downloadgnunet-024450ec8ac7d00b5c7c830d34ee1843b6c3a753.tar.gz
gnunet-024450ec8ac7d00b5c7c830d34ee1843b6c3a753.zip
indenting
Diffstat (limited to 'src/util/server.c')
-rw-r--r--src/util/server.c43
1 files changed, 23 insertions, 20 deletions
diff --git a/src/util/server.c b/src/util/server.c
index d761f6a92..de81a08ea 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -275,16 +275,17 @@ process_listen_socket (void *cls,
275 if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) 275 if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
276 { 276 {
277 server->listen_task = GNUNET_SCHEDULER_add_select (server->sched, 277 server->listen_task = GNUNET_SCHEDULER_add_select (server->sched,
278 GNUNET_SCHEDULER_PRIORITY_HIGH, 278 GNUNET_SCHEDULER_PRIORITY_HIGH,
279 GNUNET_SCHEDULER_NO_TASK, 279 GNUNET_SCHEDULER_NO_TASK,
280 GNUNET_TIME_UNIT_FOREVER_REL, 280 GNUNET_TIME_UNIT_FOREVER_REL,
281 r, NULL, &process_listen_socket, 281 r, NULL,
282 server); 282 &process_listen_socket,
283 server);
283 GNUNET_NETWORK_fdset_destroy (r); 284 GNUNET_NETWORK_fdset_destroy (r);
284 return; /* ignore shutdown, someone else will take care of it! */ 285 return; /* ignore shutdown, someone else will take care of it! */
285 } 286 }
286 GNUNET_assert (GNUNET_NETWORK_fdset_isset 287 GNUNET_assert (GNUNET_NETWORK_fdset_isset
287 (tc->read_ready, server->listen_socket)); 288 (tc->read_ready, server->listen_socket));
288 sock = 289 sock =
289 GNUNET_CONNECTION_create_from_accept (tc->sched, server->access, 290 GNUNET_CONNECTION_create_from_accept (tc->sched, server->access,
290 server->access_cls, 291 server->access_cls,
@@ -302,10 +303,12 @@ process_listen_socket (void *cls,
302 } 303 }
303 /* listen for more! */ 304 /* listen for more! */
304 server->listen_task = GNUNET_SCHEDULER_add_select (server->sched, 305 server->listen_task = GNUNET_SCHEDULER_add_select (server->sched,
305 GNUNET_SCHEDULER_PRIORITY_HIGH, 306 GNUNET_SCHEDULER_PRIORITY_HIGH,
306 GNUNET_SCHEDULER_NO_TASK, 307 GNUNET_SCHEDULER_NO_TASK,
307 GNUNET_TIME_UNIT_FOREVER_REL, 308 GNUNET_TIME_UNIT_FOREVER_REL,
308 r, NULL, &process_listen_socket, server); 309 r, NULL,
310 &process_listen_socket,
311 server);
309 GNUNET_NETWORK_fdset_destroy (r); 312 GNUNET_NETWORK_fdset_destroy (r);
310} 313}
311 314
@@ -418,11 +421,13 @@ GNUNET_SERVER_create (struct GNUNET_SCHEDULER_Handle *sched,
418 { 421 {
419 r = GNUNET_NETWORK_fdset_create (); 422 r = GNUNET_NETWORK_fdset_create ();
420 GNUNET_NETWORK_fdset_set (r, ret->listen_socket); 423 GNUNET_NETWORK_fdset_set (r, ret->listen_socket);
421 ret->listen_task = GNUNET_SCHEDULER_add_select (sched, 424 ret->listen_task = GNUNET_SCHEDULER_add_select (sched,
422 GNUNET_SCHEDULER_PRIORITY_HIGH, 425 GNUNET_SCHEDULER_PRIORITY_HIGH,
423 GNUNET_SCHEDULER_NO_TASK, 426 GNUNET_SCHEDULER_NO_TASK,
424 GNUNET_TIME_UNIT_FOREVER_REL, r, NULL, 427 GNUNET_TIME_UNIT_FOREVER_REL,
425 &process_listen_socket, ret); 428 r, NULL,
429 &process_listen_socket,
430 ret);
426 GNUNET_NETWORK_fdset_destroy (r); 431 GNUNET_NETWORK_fdset_destroy (r);
427 } 432 }
428 return ret; 433 return ret;
@@ -444,12 +449,10 @@ GNUNET_SERVER_destroy (struct GNUNET_SERVER_Handle *s)
444#endif 449#endif
445 if (GNUNET_SCHEDULER_NO_TASK != s->listen_task) 450 if (GNUNET_SCHEDULER_NO_TASK != s->listen_task)
446 { 451 {
447 GNUNET_SCHEDULER_cancel (s->sched, 452 GNUNET_SCHEDULER_cancel (s->sched, s->listen_task);
448 s->listen_task);
449 s->listen_task = GNUNET_SCHEDULER_NO_TASK; 453 s->listen_task = GNUNET_SCHEDULER_NO_TASK;
450 } 454 }
451 GNUNET_break (GNUNET_OK == 455 GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s->listen_socket));
452 GNUNET_NETWORK_socket_close (s->listen_socket));
453 s->listen_socket = NULL; 456 s->listen_socket = NULL;
454 while (s->clients != NULL) 457 while (s->clients != NULL)
455 { 458 {