stuff

[oweals/gnunet.git] / src / util / service.c

diff --git a/src/util/service.c b/src/util/service.c
index 8597fddf604d3f09e0f806210ef9388887d2b1bf..2214efe108d2edb44a7232db9ff336a61c7ebcbd 100644 (file)
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -578,8 +578,8 @@ transmit_shutdown_deny (void *cls, size_t size, void *buf)
 
   if (size < sizeof (struct GNUNET_MessageHeader))
     {
-      return 0;                 /* client disconnected */
       GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+      return 0;                 /* client disconnected */
     }
   msg = (struct GNUNET_MessageHeader *) buf;
   msg->type = htons (GNUNET_MESSAGE_TYPE_SHUTDOWN_REFUSE);
@@ -597,10 +597,15 @@ transmit_shutdown_ack (void *cls, size_t size, void *buf)
 
   if (size < sizeof (struct GNUNET_MessageHeader))
     {
-      return 0;                 /* client disconnected */
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  _("Failed to transmit shutdown ACK.\n"));
       GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+      return 0;                 /* client disconnected */
     }
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              _("Transmitting shutdown ACK.\n"));
+
   msg = (struct GNUNET_MessageHeader *) buf;
   msg->type = htons (GNUNET_MESSAGE_TYPE_SHUTDOWN_ACK);
   msg->size = htons (sizeof (struct GNUNET_MessageHeader));
@@ -623,7 +628,6 @@ handle_shutdown (void *cls,
 {
   struct GNUNET_SERVICE_Context *service = cls;
 
-  /* FIXME: why is this call necessary???? */
   GNUNET_SERVER_client_keep(client);
   if (!service->allow_shutdown)
     {
@@ -1009,7 +1013,6 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName,
 #endif
           ((struct sockaddr_in *) saddrs[1])->sin_family = AF_INET;
           ((struct sockaddr_in *) saddrs[1])->sin_port = htons (port);
-
         }
     }
   *addrs = saddrs;