aboutsummaryrefslogtreecommitdiff
path: root/src/arm/gnunet-service-arm_interceptor.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/arm/gnunet-service-arm_interceptor.c')
-rw-r--r--src/arm/gnunet-service-arm_interceptor.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/arm/gnunet-service-arm_interceptor.c b/src/arm/gnunet-service-arm_interceptor.c
index 6d417ba37..59f8ac30b 100644
--- a/src/arm/gnunet-service-arm_interceptor.c
+++ b/src/arm/gnunet-service-arm_interceptor.c
@@ -356,8 +356,8 @@ closeClientAndServiceSockets (struct ForwardedConnection *fc, int reason)
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 */
359static void receiveFromClient (void *cls, 359static void
360 const struct GNUNET_SCHEDULER_TaskContext *tc); 360receiveFromClient (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
361 361
362 362
363/** 363/**
@@ -366,15 +366,15 @@ static void receiveFromClient (void *cls,
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 */
369static void receiveFromService (void *cls, 369static void
370 const struct GNUNET_SCHEDULER_TaskContext *tc); 370receiveFromService (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
371 371
372 372
373/** 373/**
374 * 374 *
375 */ 375 */
376static void start_forwarding (void *cls, 376static void
377 const struct GNUNET_SCHEDULER_TaskContext *tc); 377start_forwarding (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
378 378
379 379
380 380
@@ -497,8 +497,7 @@ receiveFromService (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
497 GNUNET_a2s (fc->listen_info->service_addr, 497 GNUNET_a2s (fc->listen_info->service_addr,
498 fc->listen_info->service_addr_len), 498 fc->listen_info->service_addr_len),
499 (unsigned long long) GNUNET_TIME_relative_min (fc->back_off, 499 (unsigned long long) GNUNET_TIME_relative_min (fc->back_off,
500 rem). 500 rem).rel_value);
501 rel_value);
502#endif 501#endif
503 rem = GNUNET_TIME_absolute_get_remaining (fc->timeout); 502 rem = GNUNET_TIME_absolute_get_remaining (fc->timeout);
504 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task); 503 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task);
@@ -584,8 +583,7 @@ forwardToService (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
584 GNUNET_a2s (fc->listen_info->service_addr, 583 GNUNET_a2s (fc->listen_info->service_addr,
585 fc->listen_info->service_addr_len), 584 fc->listen_info->service_addr_len),
586 (unsigned long long) GNUNET_TIME_relative_min (fc->back_off, 585 (unsigned long long) GNUNET_TIME_relative_min (fc->back_off,
587 rem). 586 rem).rel_value);
588 rel_value);
589#endif 587#endif
590 rem = GNUNET_TIME_absolute_get_remaining (fc->timeout); 588 rem = GNUNET_TIME_absolute_get_remaining (fc->timeout);
591 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task); 589 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task);
@@ -913,8 +911,8 @@ stop_listening (const char *serviceName)
913 * @param cls callback data, struct ServiceListeningInfo describing a listen socket 911 * @param cls callback data, struct ServiceListeningInfo describing a listen socket
914 * @param tc context 912 * @param tc context
915 */ 913 */
916static void acceptConnection (void *cls, 914static void
917 const struct GNUNET_SCHEDULER_TaskContext *tc); 915acceptConnection (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
918 916
919 917
920static void 918static void
@@ -948,8 +946,8 @@ accept_and_forward (struct ServiceListeningInfo *serviceListeningInfo)
948 return; 946 return;
949 } 947 }
950 GNUNET_break (GNUNET_OK == 948 GNUNET_break (GNUNET_OK ==
951 GNUNET_NETWORK_socket_close (serviceListeningInfo-> 949 GNUNET_NETWORK_socket_close
952 listeningSocket)); 950 (serviceListeningInfo->listeningSocket));
953 start_service (NULL, serviceListeningInfo->serviceName, NULL); 951 start_service (NULL, serviceListeningInfo->serviceName, NULL);
954 GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Service `%s' started\n"), 952 GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Service `%s' started\n"),
955 fc->listen_info->serviceName); 953 fc->listen_info->serviceName);