add nick name for cached records

[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 28f3a20b8ab894721f481c470924c9d496cc5a98..cc32c46de1ba738e6a30db85a9f547faf85ac719 100644 (file)
--- a/src/regex/gnunet-service-regex.c
+++ b/src/regex/gnunet-service-regex.c
@@ -26,7 +26,7 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_regex_lib.h"
+#include "regex_internal_lib.h"
 #include "regex_ipc.h"
 
 
@@ -54,12 +54,12 @@ struct ClientEntry
   /**
    * Search handle (if this client is searching).
    */
-  struct GNUNET_REGEX_search_handle *sh;
+  struct REGEX_INTERNAL_Search *sh;
 
   /**
    * Announcement handle (if this client is announcing).
    */
-  struct GNUNET_REGEX_announce_handle *ah;
+  struct REGEX_INTERNAL_Announcement *ah;
 
   /**
    * Refresh frequency for announcements.
@@ -99,6 +99,11 @@ static struct ClientEntry *client_tail;
  */
 static struct GNUNET_SERVER_NotificationContext *nc;
 
+/**
+ * Private key for this peer.
+ */
+static struct GNUNET_CRYPTO_EddsaPrivateKey *my_private_key;
+
 
 /**
  * Task run during shutdown.
@@ -115,6 +120,8 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   stats = NULL;
   GNUNET_SERVER_notification_context_destroy (nc);
   nc = NULL;
+  GNUNET_free (my_private_key);
+  my_private_key = NULL;
 }
 
 
@@ -143,12 +150,12 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
       }
       if (NULL != ce->ah)
       {
-       GNUNET_REGEX_announce_cancel (ce->ah);
+       REGEX_INTERNAL_announce_cancel (ce->ah);
        ce->ah = NULL;
       }
       if (NULL != ce->sh)
       {
-       GNUNET_REGEX_search_cancel (ce->sh);
+       REGEX_INTERNAL_search_cancel (ce->sh);
        ce->sh = NULL;
       }
       GNUNET_CONTAINER_DLL_remove (client_head, client_tail, ce);
@@ -171,7 +178,7 @@ reannounce (void *cls,
 {
   struct ClientEntry *ce = cls;
 
-  GNUNET_REGEX_reannounce (ce->ah);
+  REGEX_INTERNAL_reannounce (ce->ah);
   ce->refresh_task = GNUNET_SCHEDULER_add_delayed (ce->frequency,
                                                   &reannounce,
                                                   ce);
@@ -186,7 +193,7 @@ reannounce (void *cls,
  * @param message the actual message
  */
 static void
-handle_announce (void *cls, 
+handle_announce (void *cls,
                 struct GNUNET_SERVER_Client *client,
                 const struct GNUNET_MessageHeader *message)
 {
@@ -205,26 +212,33 @@ handle_announce (void *cls,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
+
   ce = GNUNET_new (struct ClientEntry);
   ce->client = client;
-  ce->ah = GNUNET_REGEX_announce (dht,
-                                 &am->pid,
-                                 regex,
-                                 ntohs (am->compression),
-                                 stats);
+  ce->frequency = GNUNET_TIME_relative_ntoh (am->refresh_delay);
+  ce->refresh_task = GNUNET_SCHEDULER_add_delayed (ce->frequency,
+                                                  &reannounce,
+                                                  ce);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Starting to announce regex `%s' every %s\n",
+             regex,
+             GNUNET_STRINGS_relative_time_to_string (ce->frequency,
+                                                     GNUNET_NO));
+  ce->ah = REGEX_INTERNAL_announce (dht,
+                                   my_private_key,
+                                   regex,
+                                   ntohs (am->compression),
+                                   stats);
   if (NULL == ce->ah)
   {
     GNUNET_break (0);
+    GNUNET_SCHEDULER_cancel (ce->refresh_task);
     GNUNET_free (ce);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  ce->frequency = GNUNET_TIME_relative_ntoh (am->refresh_delay);
-  ce->refresh_task = GNUNET_SCHEDULER_add_delayed (ce->frequency,
-                                                  &reannounce,
-                                                  ce);
   GNUNET_CONTAINER_DLL_insert (client_head,
-                              client_tail, 
+                              client_tail,
                               ce);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
@@ -240,7 +254,7 @@ handle_announce (void *cls,
  * @param put_path Path of the put request.
  * @param put_path_length Length of the put_path.
  */
-static void 
+static void
 handle_search_result (void *cls,
                      const struct GNUNET_PeerIdentity *id,
                      const struct GNUNET_PeerIdentity *get_path,
@@ -269,11 +283,11 @@ handle_search_result (void *cls,
   result->put_path_length = htons ((uint16_t) put_path_length);
   result->id = *id;
   gp = &result->id;
-  memcpy (&gp[1], 
+  memcpy (&gp[1],
          get_path,
          get_path_length * sizeof (struct GNUNET_PeerIdentity));
-  memcpy (&gp[1 + get_path_length], 
-         put_path, 
+  memcpy (&gp[1 + get_path_length],
+         put_path,
          put_path_length * sizeof (struct GNUNET_PeerIdentity));
   GNUNET_SERVER_notification_context_unicast (nc,
                                              ce->client,
@@ -290,7 +304,7 @@ handle_search_result (void *cls,
  * @param message the actual message
  */
 static void
-handle_search (void *cls, 
+handle_search (void *cls,
               struct GNUNET_SERVER_Client *client,
               const struct GNUNET_MessageHeader *message)
 {
@@ -311,7 +325,7 @@ handle_search (void *cls,
   }
   ce = GNUNET_new (struct ClientEntry);
   ce->client = client;
-  ce->sh = GNUNET_REGEX_search (dht,
+  ce->sh = REGEX_INTERNAL_search (dht,
                                string,
                                &handle_search_result,
                                ce,
@@ -324,7 +338,7 @@ handle_search (void *cls,
     return;
   }
   GNUNET_CONTAINER_DLL_insert (client_head,
-                              client_tail, 
+                              client_tail,
                               ce);
   GNUNET_SERVER_notification_context_add (nc, client);
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -347,9 +361,18 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
     {&handle_search, NULL, GNUNET_MESSAGE_TYPE_REGEX_SEARCH, 0},
     {NULL, NULL, 0, 0}
   };
+
+  my_private_key = GNUNET_CRYPTO_eddsa_key_create_from_configuration (cfg);
+  if (NULL == my_private_key)
+  {
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   dht = GNUNET_DHT_connect (cfg, 1024);
   if (NULL == dht)
   {
+    GNUNET_free (my_private_key);
+    my_private_key = NULL;
     GNUNET_SCHEDULER_shutdown ();
     return;
   }