NAMESTORE: Allow to purge/recover orphans using CLI. Do not handle orphans in service

2 files changed, 278 insertions, 270 deletions

diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 5329ee2ef..57751d5a2 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -56,6 +56,57 @@ struct RecordSetEntry
   struct GNUNET_GNSRECORD_Data record;
 };
 
+/**
+ * The orphaned record
+ */
+struct Orphan
+{
+  /**
+   * DLL
+   */
+  struct Orphan *next;
+
+  /**
+   * DLL
+   */
+  struct Orphan *prev;
+
+  /**
+   * Ego Identifier
+   */
+  char *name;
+
+  /**
+   * The zone key
+   */
+  struct GNUNET_IDENTITY_PrivateKey key;
+};
+
+/**
+ * The default namestore ego
+ */
+struct EgoEntry
+{
+  /**
+   * DLL
+   */
+  struct EgoEntry *next;
+
+  /**
+   * DLL
+   */
+  struct EgoEntry *prev;
+
+  /**
+   * Ego Identifier
+   */
+  char *identifier;
+
+  /**
+   * The Ego
+   */
+  struct GNUNET_IDENTITY_Ego *ego;
+};
 
 /**
  * Handle to the namestore.
@@ -113,6 +164,27 @@ static struct GNUNET_NAMESTORE_QueueEntry *get_qe;
 static struct GNUNET_NAMESTORE_QueueEntry *reverse_qe;
 
 /**
+ * Orphan list
+ */
+static struct Orphan *orphans_head;
+
+/**
+ * Orphan list
+ */
+static struct Orphan *orphans_tail;
+
+
+/**
+ * Ego list
+ */
+static struct EgoEntry *ego_head;
+
+/**
+ * Ego list
+ */
+static struct EgoEntry *ego_tail;
+
+/**
  * Desired action is to list records.
  */
 static int list;
@@ -148,6 +220,16 @@ static int omit_private;
 static int include_maintenance;
 
 /**
+ * Purge orphaned records
+ */
+static int purge_orphaned;
+
+/**
+ * Recover zone keys of orphaned records
+ */
+static int recover_orphaned;
+
+/**
  * Queue entry for the 'del' operation.
  */
 static struct GNUNET_NAMESTORE_QueueEntry *del_qe;
@@ -237,6 +319,10 @@ static int monitor;
  */
 static struct RecordSetEntry *recordset;
 
+/**
+ * Purge task
+ */
+static struct GNUNET_SCHEDULER_Task *purge_task;
 
 /**
  * Task run on shutdown.  Cleans up everything.
@@ -246,12 +332,21 @@ static struct RecordSetEntry *recordset;
 static void
 do_shutdown (void *cls)
 {
+  struct EgoEntry *ego_entry;
+  struct EgoEntry *ego_tmp;
+  struct Orphan *orphan;
+  struct Orphan *orphan_tmp;
   (void) cls;
   if (NULL != get_default)
   {
     GNUNET_IDENTITY_cancel (get_default);
     get_default = NULL;
   }
+  if (NULL != purge_task)
+  {
+    GNUNET_SCHEDULER_cancel (purge_task);
+    purge_task = NULL;
+  }
   if (NULL != idh)
   {
     GNUNET_IDENTITY_disconnect (idh);
@@ -262,6 +357,20 @@ do_shutdown (void *cls)
     GNUNET_IDENTITY_ego_lookup_cancel (el);
     el = NULL;
   }
+  for (orphan = orphans_head; NULL != orphan;)
+  {
+    orphan_tmp = orphan;
+    orphan = orphan->next;
+    GNUNET_free (orphan_tmp->name);
+    GNUNET_free (orphan_tmp);
+  }
+  for (ego_entry = ego_head; NULL != ego_entry;)
+  {
+    ego_tmp = ego_entry;
+    ego_entry = ego_entry->next;
+    GNUNET_free (ego_tmp->identifier);
+    GNUNET_free (ego_tmp);
+  }
   if (NULL != list_it)
   {
     GNUNET_NAMESTORE_zone_iteration_stop (list_it);
@@ -361,6 +470,48 @@ del_continuation (void *cls, enum GNUNET_ErrorCode ec)
   test_finished ();
 }
 
+static void
+purge_next_orphan (void *cls);
+
+static void
+orphan_deleted (void *cls, enum GNUNET_ErrorCode ec)
+{
+  del_qe = NULL;
+  if (GNUNET_EC_NONE != ec)
+  {
+    fprintf (stderr,
+             _ ("Deleting orphan failed: %s\n"),
+             GNUNET_ErrorCode_get_hint (ec));
+  }
+  purge_task = GNUNET_SCHEDULER_add_now (&purge_next_orphan, NULL);
+}
+
+
+static void
+purge_next_orphan (void *cls)
+{
+  struct Orphan *orphan;
+  purge_task = NULL;
+
+  if (NULL == orphans_head)
+  {
+    ret = 0;
+    test_finished ();
+    return;
+  }
+  orphan = orphans_head;
+  GNUNET_CONTAINER_DLL_remove (orphans_head,
+                               orphans_tail,
+                               orphan);
+  del_qe = GNUNET_NAMESTORE_records_store (ns,
+                                           &orphan->key,
+                                           orphan->name,
+                                           0, NULL,
+                                           &orphan_deleted,
+                                           NULL);
+  GNUNET_free (orphan->name);
+  GNUNET_free (orphan);
+}
 
 /**
  * Function called when we are done with a zone iteration.
@@ -370,6 +521,12 @@ zone_iteration_finished (void *cls)
 {
   (void) cls;
   list_it = NULL;
+  if (purge_orphaned)
+  {
+    purge_task = GNUNET_SCHEDULER_add_now (&purge_next_orphan, NULL);
+    return;
+  }
+  ret = 0;
   test_finished ();
 }
 
@@ -387,6 +544,36 @@ zone_iteration_error_cb (void *cls)
   test_finished ();
 }
 
+static void
+collect_orphans (const struct GNUNET_IDENTITY_PrivateKey *zone_key,
+                const char *rname,
+                unsigned int rd_len,
+                const struct GNUNET_GNSRECORD_Data *rd)
+{
+  struct EgoEntry *ego;
+  struct Orphan *orphan;
+  int is_orphaned = 1;
+
+  for (ego = ego_head; NULL != ego; ego = ego->next)
+  {
+    if (0 == memcmp (GNUNET_IDENTITY_ego_get_private_key (ego->ego),
+                     zone_key,
+                     sizeof (*zone_key)))
+    {
+      is_orphaned = 0;
+      break;
+    }
+  }
+  if (is_orphaned)
+  {
+    orphan = GNUNET_new (struct Orphan);
+    orphan->key = *zone_key;
+    orphan->name = GNUNET_strdup (rname);
+    GNUNET_CONTAINER_DLL_insert (orphans_head,
+                                 orphans_tail,
+                                 orphan);
+  }
+}
 
 /**
  * Process a record that was stored in the namestore.
@@ -396,7 +583,8 @@ zone_iteration_error_cb (void *cls)
  * @param rd array of records with data to store
  */
 static void
-display_record (const char *rname,
+display_record (const struct GNUNET_IDENTITY_PrivateKey *zone_key,
+                const char *rname,
                 unsigned int rd_len,
                 const struct GNUNET_GNSRECORD_Data *rd)
 {
@@ -405,7 +593,10 @@ display_record (const char *rname,
   const char *ets;
   struct GNUNET_TIME_Absolute at;
   struct GNUNET_TIME_Relative rt;
+  struct EgoEntry *ego;
   int have_record;
+  int is_orphaned = 1;
+  char *orphaned_str;
 
   if ((NULL != name) && (0 != strcmp (name, rname)))
     return;
@@ -422,7 +613,23 @@ display_record (const char *rname,
   }
   if (GNUNET_NO == have_record)
     return;
-  fprintf (stdout, "%s:\n", rname);
+  for (ego = ego_head; NULL != ego; ego = ego->next)
+  {
+    if (0 == memcmp (GNUNET_IDENTITY_ego_get_private_key (ego->ego),
+                     zone_key,
+                     sizeof (*zone_key)))
+    {
+      is_orphaned = 0;
+      break;
+    }
+  }
+  if (recover_orphaned)
+    orphaned_str = GNUNET_IDENTITY_private_key_to_string (zone_key);
+  else
+    orphaned_str = GNUNET_strdup ("<orphaned>");
+  fprintf (stdout, "%s.%s:\n", rname, is_orphaned ? orphaned_str :
+           ego->identifier);
+  GNUNET_free (orphaned_str);
   if (NULL != typestring)
     type = GNUNET_GNSRECORD_typename_to_number (typestring);
   else
@@ -469,6 +676,21 @@ display_record (const char *rname,
   fprintf (stdout, "%s", "\n");
 }
 
+static void
+purge_orphans_iterator (void *cls,
+                         const struct GNUNET_IDENTITY_PrivateKey *zone_key,
+                         const char *rname,
+                         unsigned int rd_len,
+                         const struct GNUNET_GNSRECORD_Data *rd,
+                         struct GNUNET_TIME_Absolute expiry)
+{
+  (void) cls;
+  (void) zone_key;
+  (void) expiry;
+  collect_orphans (zone_key, rname, rd_len, rd);
+  GNUNET_NAMESTORE_zone_iterator_next (list_it, 1);
+}
+
 
 /**
  * Process a record that was stored in the namestore.
@@ -490,7 +712,7 @@ display_record_iterator (void *cls,
   (void) cls;
   (void) zone_key;
   (void) expiry;
-  display_record (rname, rd_len, rd);
+  display_record (zone_key, rname, rd_len, rd);
   GNUNET_NAMESTORE_zone_iterator_next (list_it, 1);
 }
 
@@ -515,7 +737,7 @@ display_record_monitor (void *cls,
   (void) cls;
   (void) zone_key;
   (void) expiry;
-  display_record (rname, rd_len, rd);
+  display_record (zone_key, rname, rd_len, rd);
   GNUNET_NAMESTORE_zone_monitor_next (zm, 1);
 }
 
@@ -539,7 +761,7 @@ display_record_lookup (void *cls,
   (void) cls;
   (void) zone_key;
   get_qe = NULL;
-  display_record (rname, rd_len, rd);
+  display_record (zone_key, rname, rd_len, rd);
   test_finished ();
 }
 
@@ -911,7 +1133,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
   if (include_maintenance)
     filter_flags |= GNUNET_GNSRECORD_FILTER_INCLUDE_MAINTENANCE;
   if (! (add | del | list | (NULL != nickstring) | (NULL != uri)
-         | (NULL != reverse_pkey) | (NULL != recordset) | (monitor)))
+         | (NULL != reverse_pkey) | (NULL != recordset) | (monitor)
+         | (purge_orphaned) | (recover_orphaned)) )
   {
     /* nothing more to be done */
     fprintf (stderr, _ ("No options given\n"));
@@ -1089,7 +1312,21 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                                               &del_monitor,
                                               NULL);
   }
-  if (list)
+  if (purge_orphaned)
+  {
+    list_it = GNUNET_NAMESTORE_zone_iteration_start2 (ns,
+                                                      (NULL == ego_name) ?
+                                                      NULL : &zone_pkey,
+                                                      &zone_iteration_error_cb,
+                                                      NULL,
+                                                      &purge_orphans_iterator,
+                                                      NULL,
+                                                      &zone_iteration_finished,
+                                                      NULL,
+                                                      filter_flags);
+
+  }
+  else if (list)
   {
     if (NULL != name)
       get_qe = GNUNET_NAMESTORE_records_lookup (ns,
@@ -1101,7 +1338,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
                                                 NULL);
     else
       list_it = GNUNET_NAMESTORE_zone_iteration_start2 (ns,
-                                                        &zone_pkey,
+                                                        (NULL == ego_name) ?
+                                                        NULL : &zone_pkey,
                                                         &zone_iteration_error_cb,
                                                         NULL,
                                                         &display_record_iterator,
@@ -1289,13 +1527,29 @@ id_connect_cb (void *cls,
                const char *name)
 {
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+  struct GNUNET_IDENTITY_PublicKey pk;
+  struct EgoEntry *ego_entry;
 
   (void) ctx;
   (void) name;
+  if ((NULL != name) && (NULL != ego))
+  {
+    ego_entry = GNUNET_new (struct EgoEntry);
+    GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
+    ego_entry->ego = ego;
+    ego_entry->identifier = GNUNET_strdup (name);
+    GNUNET_CONTAINER_DLL_insert_tail (ego_head,
+                                      ego_tail,
+                                      ego_entry);
+    return;
+  }
   if (NULL != ego)
     return;
-  get_default =
-    GNUNET_IDENTITY_get (idh, "namestore", &default_ego_cb, (void *) cfg);
+  if (NULL != ego_name)
+    el = GNUNET_IDENTITY_ego_lookup (cfg, ego_name, &identity_cb, (void *) cfg);
+  else
+    get_default =
+      GNUNET_IDENTITY_get (idh, "namestore", &default_ego_cb, (void *) cfg);
 }
 
 
@@ -1346,15 +1600,10 @@ run (void *cls,
     run_with_zone_pkey (cfg);
     return;
   }
-  if (NULL == ego_name)
-  {
-    idh = GNUNET_IDENTITY_connect (cfg, &id_connect_cb, (void *) cfg);
-    if (NULL == idh)
-      fprintf (stderr, _ ("Cannot connect to identity service\n"));
-    ret = -1;
-    return;
-  }
-  el = GNUNET_IDENTITY_ego_lookup (cfg, ego_name, &identity_cb, (void *) cfg);
+  idh = GNUNET_IDENTITY_connect (cfg, &id_connect_cb, (void *) cfg);
+  if (NULL == idh)
+    fprintf (stderr, _ ("Cannot connect to identity service\n"));
+  ret = -1;
 }
 
 
@@ -1600,6 +1849,16 @@ main (int argc, char *const *argv)
                                gettext_noop (
                                  "do not filter maintenance records"),
                                &include_maintenance),
+    GNUNET_GETOPT_option_flag ('P',
+                               "purge-orphans",
+                               gettext_noop (
+                                 "purge namestore of all orphans"),
+                               &purge_orphaned),
+    GNUNET_GETOPT_option_flag ('S',
+                               "show-orphans-private-key",
+                               gettext_noop (
+                                 "show private key for orphaned records for recovery using `gnunet-identity -C -P <key>'. Use in combination with --display"),
+                               &recover_orphaned),
     GNUNET_GETOPT_option_flag (
       's',
       "shadow",
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index 49c165732..b3c077141 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -341,37 +341,6 @@ struct NickCache
 };
 
 /**
- * The default namestore ego
- */
-struct EgoEntry
-{
-  /**
-   * DLL
-   */
-  struct EgoEntry *next;
-
-  /**
-   * DLL
-   */
-  struct EgoEntry *prev;
-
-  /**
-   * Ego Identifier
-   */
-  char *identifier;
-
-  /**
-   * Public key string
-   */
-  char *keystring;
-
-  /**
-   * The Ego
-   */
-  struct GNUNET_IDENTITY_Ego *ego;
-};
-
-/**
  * We cache nick records to reduce DB load.
  */
 static struct NickCache nick_cache[NC_SIZE];
@@ -392,27 +361,6 @@ static const struct GNUNET_CONFIGURATION_Handle *GSN_cfg;
 static struct GNUNET_STATISTICS_Handle *statistics;
 
 /**
- * Handle to the identity service
- */
-static struct GNUNET_IDENTITY_Handle *identity_handle;
-
-/**
- * Indicator if we already have passed the first iteration if egos
- */
-static int egos_collected = GNUNET_NO;
-
-/**
- * Ego list
- */
-static struct EgoEntry *ego_head;
-
-/**
- * Ego list
- */
-static struct EgoEntry *ego_tail;
-
-
-/**
  * Name of the database plugin
  */
 static char *db_lib_name;
@@ -461,9 +409,6 @@ static int return_orphaned;
 static void
 cleanup_task (void *cls)
 {
-  struct EgoEntry *ego_entry;
-  struct EgoEntry *ego_tmp;
-
   (void) cls;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping namestore service\n");
   if (NULL != monitor_nc)
@@ -476,20 +421,6 @@ cleanup_task (void *cls)
     GNUNET_STATISTICS_destroy (statistics, GNUNET_NO);
     statistics = NULL;
   }
-  if (NULL != identity_handle)
-  {
-    GNUNET_IDENTITY_disconnect (identity_handle);
-    identity_handle = NULL;
-    // FIXME cleanup EgoEntries
-  }
-  for (ego_entry = ego_head; NULL != ego_entry;)
-  {
-    ego_tmp = ego_entry;
-    ego_entry = ego_entry->next;
-    GNUNET_free (ego_tmp->identifier);
-    GNUNET_free (ego_tmp->keystring);
-    GNUNET_free (ego_tmp);
-  }
   GNUNET_break (NULL == GNUNET_PLUGIN_unload (db_lib_name, GSN_database));
   GNUNET_free (db_lib_name);
   db_lib_name = NULL;
@@ -508,51 +439,6 @@ free_store_activity (struct StoreActivity *sa)
   GNUNET_free (sa);
 }
 
-static enum GNUNET_GenericReturnValue
-is_orphaned (const struct GNUNET_IDENTITY_PrivateKey *zone)
-{
-  struct EgoEntry *ego_entry;
-  struct GNUNET_IDENTITY_PublicKey pk;
-  char *keystring;
-
-  GNUNET_IDENTITY_key_get_public (zone, &pk);
-  keystring = GNUNET_IDENTITY_public_key_to_string (&pk);
-
-  if (GNUNET_YES == return_orphaned)
-    return GNUNET_NO;
-  for (ego_entry = ego_head; NULL != ego_entry;
-       ego_entry = ego_entry->next)
-  {
-    if (0 == strcmp (ego_entry->keystring, keystring))
-      break;
-  }
-  if (NULL != ego_entry)
-  {
-    GNUNET_free (keystring);
-    return GNUNET_NO;
-  }
-  /*if (purge_orphans)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Removing orphaned zone data for ego %s\n",
-                ego_entry->keystring);
-    res = GSN_database->delete_records (GSN_database->cls,
-                                        zone,
-                                        &emsg);
-    if (GNUNET_SYSERR == res)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Error removing orphaned zone data: %s\n", emsg);
-    }
-  }*/
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "Found orphaned zone data for zone key %s\n",
-              keystring);
-  GNUNET_free (keystring);
-  return GNUNET_YES;
-}
-
-
 /**
  * Function called with the records for the #GNUNET_GNS_EMPTY_LABEL_AT
  * label in the zone.  Used to locate the #GNUNET_GNSRECORD_TYPE_NICK
@@ -917,31 +803,6 @@ send_lookup_response_with_filter (struct NamestoreClient *nc,
 }
 
 /**
- * Generate a `struct LookupNameResponseMessage` and send it to the
- * given client using the given notification context.
- *
- * @param nc client to unicast to
- * @param request_id request ID to use
- * @param zone_key zone key of the zone
- * @param name name
- * @param rd_count number of records in @a rd
- * @param rd array of records
- */
-static int
-send_lookup_response (struct NamestoreClient *nc,
-                      uint32_t request_id,
-                      const struct
-                      GNUNET_IDENTITY_PrivateKey *zone_key,
-                      const char *name,
-                      unsigned int rd_count,
-                      const struct GNUNET_GNSRECORD_Data *rd)
-{
-  return send_lookup_response_with_filter (nc, request_id, zone_key, name,
-                                           rd_count, rd,
-                                           GNUNET_GNSRECORD_FILTER_NONE);
-}
-
-/**
  * Send response to the store request to the client.
  *
  * @param nc client to talk to
@@ -2201,13 +2062,6 @@ zone_iterate_proc (void *cls,
     return;
   }
   proc->zi->seq = seq;
-  if (GNUNET_YES == is_orphaned (zone_key))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Skipping orphaned zone data\n");
-    proc->run_again = GNUNET_YES;
-    return;
-  }
   if (0 < send_lookup_response_with_filter (proc->zi->nc,
                                             proc->zi->request_id,
                                             zone_key,
@@ -2471,13 +2325,6 @@ monitor_iterate_cb (void *cls,
                             "Monitor notifications sent",
                             1,
                             GNUNET_NO);
-  if (GNUNET_YES == is_orphaned (zone_key))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Skipping orphaned zone data\n");
-    zm->run_again = GNUNET_YES;
-    return;
-  }
   if (0 < send_lookup_response_with_filter (zm->nc, 0, zone_key, name,
                                             rd_count, rd, zm->filter))
   {
@@ -2635,100 +2482,6 @@ handle_monitor_next (void *cls, const struct ZoneMonitorNextMessage *nm)
   }
 }
 
-static void
-ego_callback (void *cls,
-              struct GNUNET_IDENTITY_Ego *ego,
-              void **ctx,
-              const char *identifier)
-{
-  struct EgoEntry *ego_entry;
-  struct GNUNET_SERVICE_Handle *service = cls;
-  struct GNUNET_IDENTITY_PublicKey pk;
-
-  if ((NULL == ego) && (GNUNET_NO == egos_collected))
-  {
-    egos_collected = GNUNET_YES;
-    GNUNET_SERVICE_resume (service);
-    return;
-  }
-  if (NULL == ego)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Called with NULL ego\n");
-    return;
-  }
-  if ((GNUNET_NO == egos_collected) &&
-      (NULL != identifier))
-  {
-    ego_entry = GNUNET_new (struct EgoEntry);
-    GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-    ego_entry->keystring = GNUNET_IDENTITY_public_key_to_string (&pk);
-    ego_entry->ego = ego;
-    ego_entry->identifier = GNUNET_strdup (identifier);
-    GNUNET_CONTAINER_DLL_insert_tail (ego_head,
-                                      ego_tail,
-                                      ego_entry);
-    return;
-  }
-  /* Ego renamed or added */
-  if (identifier != NULL)
-  {
-    for (ego_entry = ego_head; NULL != ego_entry;
-         ego_entry = ego_entry->next)
-    {
-      if (ego_entry->ego == ego)
-      {
-        /* Rename */
-        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                    "Renaming ego %s->%s\n", ego_entry->identifier,
-                    identifier);
-        GNUNET_free (ego_entry->identifier);
-        ego_entry->identifier = GNUNET_strdup (identifier);
-        break;
-      }
-    }
-    if (NULL == ego_entry)
-    {
-      /* Add */
-      ego_entry = GNUNET_new (struct EgoEntry);
-      GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-      ego_entry->keystring = GNUNET_IDENTITY_public_key_to_string (&pk);
-      ego_entry->ego = ego;
-      ego_entry->identifier = GNUNET_strdup (identifier);
-      GNUNET_CONTAINER_DLL_insert_tail (ego_head,
-                                        ego_tail,
-                                        ego_entry);
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  "Added ego %s\n", ego_entry->identifier);
-    }
-  }
-  else
-  {
-    /* Delete */
-    for (ego_entry = ego_head; NULL != ego_entry;
-         ego_entry = ego_entry->next)
-    {
-      if (ego_entry->ego == ego)
-        break;
-    }
-    if (NULL == ego_entry)
-      return;   /* Not found */
-
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Removing ego %s\n", ego_entry->identifier);
-    GNUNET_CONTAINER_DLL_remove (ego_head,
-                                 ego_tail,
-                                 ego_entry);
-    GNUNET_free (ego_entry->identifier);
-    GNUNET_free (ego_entry->keystring);
-    GNUNET_free (ego_entry);
-    return;
-  }
-
-}
-
-
-
 /**
  * Process namestore requests.
  *
@@ -2773,10 +2526,6 @@ run (void *cls,
     GNUNET_SCHEDULER_add_now (&cleanup_task, NULL);
     return;
   }
-  egos_collected = GNUNET_NO;
-  /** Suspend until we have all egos */
-  GNUNET_SERVICE_suspend (service);
-  identity_handle = GNUNET_IDENTITY_connect (cfg, &ego_callback, service);
   GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL);
 }