diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-29 10:19:43 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-29 10:19:43 +0000 |
commit | cddbdf5b928c68ab71b40c950b9f01ea68a9fbdb (patch) | |
tree | b704e00a3af618b2cd174a7f89514eaebd82a1cf /src/arm | |
parent | bb4fc4f4007988874f910d4de5492f9629301641 (diff) | |
download | gnunet-cddbdf5b928c68ab71b40c950b9f01ea68a9fbdb.tar.gz gnunet-cddbdf5b928c68ab71b40c950b9f01ea68a9fbdb.zip |
run indent twice, it alternates between two 'canonical' forms, also run whitespace remover
Diffstat (limited to 'src/arm')
-rw-r--r-- | src/arm/gnunet-service-arm.c | 10 | ||||
-rw-r--r-- | src/arm/gnunet-service-arm.h | 4 | ||||
-rw-r--r-- | src/arm/gnunet-service-arm_interceptor.c | 36 |
3 files changed, 25 insertions, 25 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index e85b2eb12..eb19776e6 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -103,12 +103,12 @@ struct ServiceList | |||
103 | time_t mtime; | 103 | time_t mtime; |
104 | 104 | ||
105 | /** | 105 | /** |
106 | * Process exponential backoff time | 106 | * Process exponential backoff time |
107 | */ | 107 | */ |
108 | struct GNUNET_TIME_Relative backoff; | 108 | struct GNUNET_TIME_Relative backoff; |
109 | 109 | ||
110 | /** | 110 | /** |
111 | * Absolute time at which the process is scheduled to restart in case of death | 111 | * Absolute time at which the process is scheduled to restart in case of death |
112 | */ | 112 | */ |
113 | struct GNUNET_TIME_Absolute restartAt; | 113 | struct GNUNET_TIME_Absolute restartAt; |
114 | 114 | ||
@@ -631,8 +631,8 @@ clean_up_running () | |||
631 | 631 | ||
632 | 632 | ||
633 | /** | 633 | /** |
634 | * We are done with everything. Stop remaining | 634 | * We are done with everything. Stop remaining |
635 | * tasks, signal handler and the server. | 635 | * tasks, signal handler and the server. |
636 | */ | 636 | */ |
637 | static void | 637 | static void |
638 | do_shutdown () | 638 | do_shutdown () |
@@ -743,7 +743,7 @@ delayed_restart_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
743 | 743 | ||
744 | /** | 744 | /** |
745 | * Task triggered whenever we receive a SIGCHLD (child | 745 | * Task triggered whenever we receive a SIGCHLD (child |
746 | * process died). | 746 | * process died). |
747 | * | 747 | * |
748 | * @param cls closure, NULL if we need to self-restart | 748 | * @param cls closure, NULL if we need to self-restart |
749 | * @param tc context | 749 | * @param tc context |
diff --git a/src/arm/gnunet-service-arm.h b/src/arm/gnunet-service-arm.h index e8d125b92..689f26c82 100644 --- a/src/arm/gnunet-service-arm.h +++ b/src/arm/gnunet-service-arm.h | |||
@@ -31,7 +31,7 @@ | |||
31 | * Start the specified service. | 31 | * Start the specified service. |
32 | * | 32 | * |
33 | * @param client who is asking for this | 33 | * @param client who is asking for this |
34 | * @param servicename name of the service to start | 34 | * @param servicename name of the service to start |
35 | * @param lsocks -1 terminated list of listen sockets to pass (systemd style), or NULL | 35 | * @param lsocks -1 terminated list of listen sockets to pass (systemd style), or NULL |
36 | * @return GNUNET_OK on success | 36 | * @return GNUNET_OK on success |
37 | */ | 37 | */ |
@@ -41,7 +41,7 @@ start_service (struct GNUNET_SERVER_Client *client, const char *servicename, | |||
41 | 41 | ||
42 | /** | 42 | /** |
43 | * Stop listening for connections to a service. | 43 | * Stop listening for connections to a service. |
44 | * | 44 | * |
45 | * @param serviceName name of service to stop listening for | 45 | * @param serviceName name of service to stop listening for |
46 | * @return GNUNET_OK if we stopped to listen, GNUNET_NO if we were | 46 | * @return GNUNET_OK if we stopped to listen, GNUNET_NO if we were |
47 | * not listening | 47 | * not listening |
diff --git a/src/arm/gnunet-service-arm_interceptor.c b/src/arm/gnunet-service-arm_interceptor.c index 59f8ac30b..837f67d4d 100644 --- a/src/arm/gnunet-service-arm_interceptor.c +++ b/src/arm/gnunet-service-arm_interceptor.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * @file arm/gnunet-service-arm_interceptor.c | 21 | * @file arm/gnunet-service-arm_interceptor.c |
22 | * @brief listen to incoming connections from clients to services, | 22 | * @brief listen to incoming connections from clients to services, |
23 | * start services for which incoming an incoming connection occur, | 23 | * start services for which incoming an incoming connection occur, |
24 | * and relay communication between the client and the service for | 24 | * and relay communication between the client and the service for |
25 | * that first incoming connection. | 25 | * that first incoming connection. |
26 | * | 26 | * |
27 | * @author Safey Abdel Halim | 27 | * @author Safey Abdel Halim |
@@ -228,7 +228,7 @@ static struct ServiceListeningInfo *serviceListeningInfoList_tail; | |||
228 | 228 | ||
229 | /** | 229 | /** |
230 | * Put the default services represented by a space separated string into an array of strings | 230 | * Put the default services represented by a space separated string into an array of strings |
231 | * | 231 | * |
232 | * @param services space separated string of default services | 232 | * @param services space separated string of default services |
233 | */ | 233 | */ |
234 | static void | 234 | static void |
@@ -264,7 +264,7 @@ addDefaultServicesToList (const char *services) | |||
264 | 264 | ||
265 | /** | 265 | /** |
266 | * Checks whether the serviceName is in the list of default services | 266 | * Checks whether the serviceName is in the list of default services |
267 | * | 267 | * |
268 | * @param serviceName string to check its existance in the list | 268 | * @param serviceName string to check its existance in the list |
269 | * @return GNUNET_YES if the service is started by default | 269 | * @return GNUNET_YES if the service is started by default |
270 | */ | 270 | */ |
@@ -283,7 +283,7 @@ isInDefaultList (const char *serviceName) | |||
283 | /** | 283 | /** |
284 | * Close forwarded connection (partial or full). | 284 | * Close forwarded connection (partial or full). |
285 | * | 285 | * |
286 | * @param fc connection to close | 286 | * @param fc connection to close |
287 | * @param reason which direction to close | 287 | * @param reason which direction to close |
288 | */ | 288 | */ |
289 | static void | 289 | static void |
@@ -352,9 +352,9 @@ closeClientAndServiceSockets (struct ForwardedConnection *fc, int reason) | |||
352 | 352 | ||
353 | /** | 353 | /** |
354 | * Read data from the client and then forward it to the service. | 354 | * Read data from the client and then forward it to the service. |
355 | * | 355 | * |
356 | * @param cls callback data, struct ForwardedConnection for the communication between client and service | 356 | * @param cls callback data, struct ForwardedConnection for the communication between client and service |
357 | * @param tc context | 357 | * @param tc context |
358 | */ | 358 | */ |
359 | static void | 359 | static void |
360 | receiveFromClient (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | 360 | receiveFromClient (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); |
@@ -362,7 +362,7 @@ receiveFromClient (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | |||
362 | 362 | ||
363 | /** | 363 | /** |
364 | * Receive service messages sent by the service and forward it to client | 364 | * Receive service messages sent by the service and forward it to client |
365 | * | 365 | * |
366 | * @param cls callback data, struct ForwardedConnection for the communication between client and service | 366 | * @param cls callback data, struct ForwardedConnection for the communication between client and service |
367 | * @param tc scheduler context | 367 | * @param tc scheduler context |
368 | */ | 368 | */ |
@@ -380,7 +380,7 @@ start_forwarding (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | |||
380 | 380 | ||
381 | /** | 381 | /** |
382 | * Forward messages sent from service to client | 382 | * Forward messages sent from service to client |
383 | * | 383 | * |
384 | * @param cls callback data, struct ForwardedConnection for the communication between client and service | 384 | * @param cls callback data, struct ForwardedConnection for the communication between client and service |
385 | * @param tc context | 385 | * @param tc context |
386 | */ | 386 | */ |
@@ -437,7 +437,7 @@ forwardToClient (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
437 | 437 | ||
438 | /** | 438 | /** |
439 | * Receive service messages sent by the service and forward it to client | 439 | * Receive service messages sent by the service and forward it to client |
440 | * | 440 | * |
441 | * @param cls callback data, struct ForwardedConnection for the communication between client and service | 441 | * @param cls callback data, struct ForwardedConnection for the communication between client and service |
442 | * @param tc scheduler context | 442 | * @param tc scheduler context |
443 | */ | 443 | */ |
@@ -531,7 +531,7 @@ receiveFromService (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
531 | 531 | ||
532 | /** | 532 | /** |
533 | * Forward client message to service | 533 | * Forward client message to service |
534 | * | 534 | * |
535 | * @param cls callback data, struct ForwardedConnection for the communication between client and service | 535 | * @param cls callback data, struct ForwardedConnection for the communication between client and service |
536 | * @param tc scheduler context | 536 | * @param tc scheduler context |
537 | */ | 537 | */ |
@@ -626,9 +626,9 @@ forwardToService (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
626 | 626 | ||
627 | /** | 627 | /** |
628 | * Read data from the client and then forward it to the service. | 628 | * Read data from the client and then forward it to the service. |
629 | * | 629 | * |
630 | * @param cls callback data, struct ForwardedConnection for the communication between client and service | 630 | * @param cls callback data, struct ForwardedConnection for the communication between client and service |
631 | * @param tc context | 631 | * @param tc context |
632 | */ | 632 | */ |
633 | static void | 633 | static void |
634 | receiveFromClient (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 634 | receiveFromClient (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
@@ -907,9 +907,9 @@ stop_listening (const char *serviceName) | |||
907 | /** | 907 | /** |
908 | * First connection has come to the listening socket associated with the service, | 908 | * First connection has come to the listening socket associated with the service, |
909 | * create the service in order to relay the incoming connection to it | 909 | * create the service in order to relay the incoming connection to it |
910 | * | 910 | * |
911 | * @param cls callback data, struct ServiceListeningInfo describing a listen socket | 911 | * @param cls callback data, struct ServiceListeningInfo describing a listen socket |
912 | * @param tc context | 912 | * @param tc context |
913 | */ | 913 | */ |
914 | static void | 914 | static void |
915 | acceptConnection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | 915 | acceptConnection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); |
@@ -970,9 +970,9 @@ accept_and_forward (struct ServiceListeningInfo *serviceListeningInfo) | |||
970 | /** | 970 | /** |
971 | * First connection has come to the listening socket associated with the service, | 971 | * First connection has come to the listening socket associated with the service, |
972 | * create the service in order to relay the incoming connection to it | 972 | * create the service in order to relay the incoming connection to it |
973 | * | 973 | * |
974 | * @param cls callback data, struct ServiceListeningInfo describing a listen socket | 974 | * @param cls callback data, struct ServiceListeningInfo describing a listen socket |
975 | * @param tc context | 975 | * @param tc context |
976 | */ | 976 | */ |
977 | static void | 977 | static void |
978 | acceptConnection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 978 | acceptConnection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
@@ -1042,7 +1042,7 @@ acceptConnection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1042 | /** | 1042 | /** |
1043 | * Creating a listening socket for each of the service's addresses and | 1043 | * Creating a listening socket for each of the service's addresses and |
1044 | * wait for the first incoming connection to it | 1044 | * wait for the first incoming connection to it |
1045 | * | 1045 | * |
1046 | * @param sa address associated with the service | 1046 | * @param sa address associated with the service |
1047 | * @param addr_len length of sa | 1047 | * @param addr_len length of sa |
1048 | * @param serviceName the name of the service in question | 1048 | * @param serviceName the name of the service in question |
@@ -1132,7 +1132,7 @@ createListeningSocket (struct sockaddr *sa, socklen_t addr_len, | |||
1132 | /** | 1132 | /** |
1133 | * Callback function, checks whether the current tokens are representing a service, | 1133 | * Callback function, checks whether the current tokens are representing a service, |
1134 | * gets its addresses and create listening socket for it. | 1134 | * gets its addresses and create listening socket for it. |
1135 | * | 1135 | * |
1136 | * @param cls callback data, not used | 1136 | * @param cls callback data, not used |
1137 | * @param section configuration section | 1137 | * @param section configuration section |
1138 | * @param option configuration option | 1138 | * @param option configuration option |