add '-m' option to gnunet-namestore, extend namestore monitor API with notification about being in sync

1 files changed, 37 insertions, 0 deletions

diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index c43b18593..95f0b520f 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -163,6 +163,15 @@ static struct GNUNET_TIME_Absolute etime_abs;
  */
 static int etime_is_rel = GNUNET_SYSERR;
 
+/**
+ * Monitor handle.
+ */
+static struct GNUNET_NAMESTORE_ZoneMonitor *zm;
+
+/**
+ * Enables monitor mode.
+ */
+static int monitor;
 
 /**
  * Task run on shutdown.  Cleans up everything.
@@ -215,6 +224,11 @@ do_shutdown (void *cls,
     GNUNET_free (uri);
     uri = NULL;
   }
+  if (NULL != zm)
+  {
+    GNUNET_NAMESTORE_zone_monitor_stop (zm);
+    zm = NULL;
+  }
 }
 
 
@@ -358,6 +372,18 @@ display_record (void *cls,
 
 
 /**
+ * Function called once we are in sync in monitor mode.
+ *
+ * @param cls NULL
+ */
+static void
+sync_cb (void *cls)
+{
+  FPRINTF (stdout, "%s", "Monitor is now in sync.\n");
+}
+
+
+/**
  * We're storing a record; this function is given the existing record
  * so that we can merge the information.
  *
@@ -643,6 +669,14 @@ key_generation_cb (void *cls,
                                                            &add_qe_uri);
   }
   GNUNET_free_non_null (data);
+  if (monitor)
+  {
+    zm = GNUNET_NAMESTORE_zone_monitor_start (cfg,
+                                              &zone,
+                                              &display_record,
+                                              &sync_cb,
+                                              NULL);
+  }
 }
 
 
@@ -740,6 +774,9 @@ main (int argc, char *const *argv)
     {'e', "expiration", "TIME",
      gettext_noop ("expiration time for record to use (for adding only), \"never\" is possible"), 1,
      &GNUNET_GETOPT_set_string, &expirationstring},   
+    {'m', "monitor", NULL,
+     gettext_noop ("monitor changes in the namestore"), 0,
+     &GNUNET_GETOPT_set_one, &monitor},   
     {'n', "name", "NAME",
      gettext_noop ("name of the record to add/delete/display"), 1,
      &GNUNET_GETOPT_set_string, &name},