diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-11-10 13:07:30 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-11-10 13:07:30 +0000 |
commit | 879fbc046c7638246c0d473c3aab2f1a8001e3af (patch) | |
tree | 1f3d825c8d3ad9d52e29ce42490eeaf38be8a977 /src/arm | |
parent | e1e25c0c4828c2d8c93f4ede4191de3895592aab (diff) | |
download | gnunet-879fbc046c7638246c0d473c3aab2f1a8001e3af.tar.gz gnunet-879fbc046c7638246c0d473c3aab2f1a8001e3af.zip |
indenting
Diffstat (limited to 'src/arm')
-rw-r--r-- | src/arm/gnunet-service-arm_interceptor.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/arm/gnunet-service-arm_interceptor.c b/src/arm/gnunet-service-arm_interceptor.c index 38306f342..1dff8f01d 100644 --- a/src/arm/gnunet-service-arm_interceptor.c +++ b/src/arm/gnunet-service-arm_interceptor.c | |||
@@ -313,7 +313,7 @@ closeClientAndServiceSockets (struct ForwardedConnection *fc, | |||
313 | #endif | 313 | #endif |
314 | if (fc->client_to_service_task != GNUNET_SCHEDULER_NO_TASK) | 314 | if (fc->client_to_service_task != GNUNET_SCHEDULER_NO_TASK) |
315 | { | 315 | { |
316 | GNUNET_SCHEDULER_cancel ( fc->client_to_service_task); | 316 | GNUNET_SCHEDULER_cancel (fc->client_to_service_task); |
317 | fc->client_to_service_task = GNUNET_SCHEDULER_NO_TASK; | 317 | fc->client_to_service_task = GNUNET_SCHEDULER_NO_TASK; |
318 | } | 318 | } |
319 | if (fc->armClientSocket != NULL) | 319 | if (fc->armClientSocket != NULL) |
@@ -331,7 +331,7 @@ closeClientAndServiceSockets (struct ForwardedConnection *fc, | |||
331 | "Closing forwarding connection (done with both directions)\n"); | 331 | "Closing forwarding connection (done with both directions)\n"); |
332 | #endif | 332 | #endif |
333 | if (fc->start_task != GNUNET_SCHEDULER_NO_TASK) | 333 | if (fc->start_task != GNUNET_SCHEDULER_NO_TASK) |
334 | GNUNET_SCHEDULER_cancel ( fc->start_task); | 334 | GNUNET_SCHEDULER_cancel (fc->start_task); |
335 | if ( (NULL != fc->armClientSocket) && | 335 | if ( (NULL != fc->armClientSocket) && |
336 | (GNUNET_SYSERR == | 336 | (GNUNET_SYSERR == |
337 | GNUNET_NETWORK_socket_close (fc->armClientSocket)) ) | 337 | GNUNET_NETWORK_socket_close (fc->armClientSocket)) ) |
@@ -661,8 +661,7 @@ receiveFromClient (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
661 | fc->armClientSocket)) | 661 | fc->armClientSocket)) |
662 | { | 662 | { |
663 | fc->client_to_service_task = | 663 | fc->client_to_service_task = |
664 | GNUNET_SCHEDULER_add_read_net ( | 664 | GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, |
665 | GNUNET_TIME_UNIT_FOREVER_REL, | ||
666 | fc->armClientSocket, | 665 | fc->armClientSocket, |
667 | &receiveFromClient, fc); | 666 | &receiveFromClient, fc); |
668 | return; | 667 | return; |
@@ -1044,7 +1043,7 @@ acceptConnection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1044 | GNUNET_free (pos->listeningSocket); /* deliberately no closing! */ | 1043 | GNUNET_free (pos->listeningSocket); /* deliberately no closing! */ |
1045 | GNUNET_free (pos->service_addr); | 1044 | GNUNET_free (pos->service_addr); |
1046 | GNUNET_free (pos->serviceName); | 1045 | GNUNET_free (pos->serviceName); |
1047 | GNUNET_SCHEDULER_cancel ( pos->acceptTask); | 1046 | GNUNET_SCHEDULER_cancel (pos->acceptTask); |
1048 | GNUNET_CONTAINER_DLL_remove (serviceListeningInfoList_head, | 1047 | GNUNET_CONTAINER_DLL_remove (serviceListeningInfoList_head, |
1049 | serviceListeningInfoList_tail, | 1048 | serviceListeningInfoList_tail, |
1050 | pos); | 1049 | pos); |