log: add \n

[oweals/gnunet.git] / src / regex / gnunet-service-regex.c

diff --git a/src/regex/gnunet-service-regex.c b/src/regex/gnunet-service-regex.c
index 6daab0be3be7dd2e8803025e88fdef86bb7caf0c..294670be658c8e66175430860781e82085602336 100644 (file)
--- a/src/regex/gnunet-service-regex.c
+++ b/src/regex/gnunet-service-regex.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -69,7 +69,7 @@ struct ClientEntry
   /**
    * Task for re-announcing.
    */
-  GNUNET_SCHEDULER_TaskIdentifier refresh_task;
+  struct GNUNET_SCHEDULER_Task * refresh_task;
 
 };
 
@@ -105,26 +105,6 @@ static struct GNUNET_SERVER_NotificationContext *nc;
 static struct GNUNET_CRYPTO_EddsaPrivateKey *my_private_key;
 
 
-/**
- * Task run during shutdown.
- *
- * @param cls unused
- * @param tc unused
- */
-static void
-cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_DHT_disconnect (dht);
-  dht = NULL;
-  GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
-  stats = NULL;
-  GNUNET_SERVER_notification_context_destroy (nc);
-  nc = NULL;
-  GNUNET_free (my_private_key);
-  my_private_key = NULL;
-}
-
-
 /**
  * A client disconnected.  Remove all of its data structure entries.
  *
@@ -132,7 +112,8 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param client identification of the client
  */
 static void
-handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
+handle_client_disconnect (void *cls,
+                          struct GNUNET_SERVER_Client *client)
 {
   struct ClientEntry *ce;
   struct ClientEntry *nx;
@@ -143,10 +124,10 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
     nx = ce->next;
     if (ce->client == client)
     {
-      if (GNUNET_SCHEDULER_NO_TASK != ce->refresh_task)
+      if (NULL != ce->refresh_task)
       {
        GNUNET_SCHEDULER_cancel (ce->refresh_task);
-       ce->refresh_task = GNUNET_SCHEDULER_NO_TASK;
+       ce->refresh_task = NULL;
       }
       if (NULL != ce->ah)
       {
@@ -158,23 +139,47 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
        REGEX_INTERNAL_search_cancel (ce->sh);
        ce->sh = NULL;
       }
-      GNUNET_CONTAINER_DLL_remove (client_head, client_tail, ce);
+      GNUNET_CONTAINER_DLL_remove (client_head,
+                                   client_tail,
+                                   ce);
       GNUNET_free (ce);
     }
   }
 }
 
 
+/**
+ * Task run during shutdown.
+ *
+ * @param cls unused
+ */
+static void
+cleanup_task (void *cls)
+{
+  struct ClientEntry *ce;
+
+  while (NULL != (ce = client_head))
+    handle_client_disconnect (NULL,
+                              ce->client);
+  GNUNET_DHT_disconnect (dht);
+  dht = NULL;
+  GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+  stats = NULL;
+  GNUNET_SERVER_notification_context_destroy (nc);
+  nc = NULL;
+  GNUNET_free (my_private_key);
+  my_private_key = NULL;
+}
+
+
 /**
  * Periodic task to refresh our announcement of the regex.
  *
- * @param cls the 'struct ClientEntry' of the client that triggered the
+ * @param cls the `struct ClientEntry *` of the client that triggered the
  *        announcement
- * @param tc scheduler context
  */
 static void
-reannounce (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+reannounce (void *cls)
 {
   struct ClientEntry *ce = cls;
 
@@ -250,9 +255,9 @@ handle_announce (void *cls,
  * @param cls the struct ClientEntry of the client searching
  * @param id Peer providing a regex that matches the string.
  * @param get_path Path of the get request.
- * @param get_path_length Lenght of get_path.
+ * @param get_path_length Lenght of @a get_path.
  * @param put_path Path of the put request.
- * @param put_path_length Length of the put_path.
+ * @param put_path_length Length of the @a put_path.
  */
 static void
 handle_search_result (void *cls,
@@ -283,10 +288,10 @@ handle_search_result (void *cls,
   result->put_path_length = htons ((uint16_t) put_path_length);
   result->id = *id;
   gp = &result->id;
-  memcpy (&gp[1],
+  GNUNET_memcpy (&gp[1],
          get_path,
          get_path_length * sizeof (struct GNUNET_PeerIdentity));
-  memcpy (&gp[1 + get_path_length],
+  GNUNET_memcpy (&gp[1 + get_path_length],
          put_path,
          put_path_length * sizeof (struct GNUNET_PeerIdentity));
   GNUNET_SERVER_notification_context_unicast (nc,
@@ -323,13 +328,16 @@ handle_search (void *cls,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Starting to search for `%s'\n",
+             string);
   ce = GNUNET_new (struct ClientEntry);
   ce->client = client;
   ce->sh = REGEX_INTERNAL_search (dht,
-                               string,
-                               &handle_search_result,
-                               ce,
-                               stats);
+                                  string,
+                                  &handle_search_result,
+                                  ce,
+                                  stats);
   if (NULL == ce->sh)
   {
     GNUNET_break (0);
@@ -376,12 +384,14 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
-                                NULL);
+  GNUNET_SCHEDULER_add_shutdown (&cleanup_task,
+                                NULL);
   nc = GNUNET_SERVER_notification_context_create (server, 1);
   stats = GNUNET_STATISTICS_create ("regex", cfg);
   GNUNET_SERVER_add_handlers (server, handlers);
-  GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL);
+  GNUNET_SERVER_disconnect_notify (server,
+                                   &handle_client_disconnect,
+                                   NULL);
 }