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

5 files changed, 91 insertions, 11 deletions

diff --git a/doc/man/gnunet-namestore.1 b/doc/man/gnunet-namestore.1
index 19c1ba285..f7a4695d7 100644
--- a/doc/man/gnunet-namestore.1
+++ b/doc/man/gnunet-namestore.1
@@ -34,6 +34,9 @@ Print short help on options.
 .IP "\-L LOGLEVEL, \-\-loglevel=LOGLEVEL"
 Use LOGLEVEL for logging.  Valid values are DEBUG, INFO, WARNING and ERROR.
 .B
+.IP "\-m, \-\-monitor"
+Monitor changes to the zone on an ongoing basis (in contrast to \-D, which merely displays the current records)
+.B
 .IP "\-n NAME, \-\-name=NAME"
 Name of the record to add/delete/display
 .B
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index 3966c3db2..70dbb5bb2 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -484,21 +484,37 @@ typedef void (*GNUNET_NAMESTORE_RecordMonitor)(void *cls,
 
 
 /**
+ * Function called once the monitor has caught up with the current 
+ * state of the database.  Will be called AGAIN after each disconnect
+ * (record monitor called with 'NULL' for zone_key) once we're again
+ * in sync.
+ *
+ * @param cls closure
+ */
+typedef void (*GNUNET_NAMESTORE_RecordsSynchronizedCallback)(void *cls);
+
+
+/**
  * Begin monitoring a zone for changes.  Will first call the 'monitor' function
- * on all existing records in the selected zone(s) and then call it whenever
- * a record changes.
+ * on all existing records in the selected zone(s), then calls 'sync_cb',
+ * and then calls the 'monitor' whenever a record changes.  If the namestore
+ * disconnects, the 'monitor' function is called with a disconnect event; if
+ * the connection is re-established, the process begins from the start (all
+ * existing records, sync, then updates).
  *
  * @param cfg configuration to use to connect to namestore
  * @param zone zone to monitor, NULL for all zones
  * @param monitor function to call on zone changes
- * @param monitor_cls closure for 'monitor'
+ * @param sync_cb function called when we're in sync with the namestore
+ * @param cls closure for 'monitor' and 'sync_cb'
  * @return handle to stop monitoring
  */
 struct GNUNET_NAMESTORE_ZoneMonitor *
 GNUNET_NAMESTORE_zone_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                      const struct GNUNET_CRYPTO_ShortHashCode *zone,
                                      GNUNET_NAMESTORE_RecordMonitor monitor,
-                                     void *monitor_cls);
+                                     GNUNET_NAMESTORE_RecordsSynchronizedCallback sync_cb,
+                                     void *cls);
 
 
 /**
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 9238924ee..c8e6a4d00 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -1408,6 +1408,11 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START 441
 
 /**
+ * Service to client: you're now in sync.
+ */
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_SYNC 442
+
+/**
  * Client to service: please start iteration; receives
  * "GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE" messages in return.
  */
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},   
diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c
index 5eb3e6803..8f6aacf19 100644
--- a/src/namestore/namestore_api_monitor.c
+++ b/src/namestore/namestore_api_monitor.c
@@ -56,9 +56,14 @@ struct GNUNET_NAMESTORE_ZoneMonitor
   GNUNET_NAMESTORE_RecordMonitor monitor;
 
   /**
-   * Closure for 'monitor'.
+   * Function called when we've synchronized.
    */
-  void *monitor_cls;
+  GNUNET_NAMESTORE_RecordsSynchronizedCallback sync_cb;
+
+  /**
+   * Closure for 'monitor' and 'sync_cb'.
+   */
+  void *cls;
 
   /**
    * Transmission handle to client.
@@ -101,7 +106,7 @@ reconnect (struct GNUNET_NAMESTORE_ZoneMonitor *zm)
 {
   if (NULL != zm->h)
     GNUNET_CLIENT_disconnect (zm->h);
-  zm->monitor (zm->monitor_cls,
+  zm->monitor (zm->cls,
                NULL,
                GNUNET_TIME_UNIT_ZERO_ABS,
                NULL, 0, NULL, NULL);
@@ -142,6 +147,17 @@ handle_updates (void *cls,
     reconnect (zm);
     return;
   }
+  if ( (ntohs (msg->size) == sizeof (struct GNUNET_MessageHeader)) &&
+       (GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_SYNC == ntohs (msg->type) ) )
+  {
+    GNUNET_CLIENT_receive (zm->h,
+                           &handle_updates,
+                           zm,
+                           GNUNET_TIME_UNIT_FOREVER_REL);
+    if (NULL != zm->sync_cb)
+      zm->sync_cb (zm->cls);
+    return;
+  }
   if ( (ntohs (msg->size) < sizeof (struct LookupNameResponseMessage)) ||
        (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE != ntohs (msg->type) ) )
   {
@@ -189,7 +205,7 @@ handle_updates (void *cls,
                            &handle_updates,
                            zm,
                            GNUNET_TIME_UNIT_FOREVER_REL);
-    zm->monitor(zm->monitor_cls, 
+    zm->monitor(zm->cls, 
                 &lrm->public_key, expire, 
                 name_tmp, 
                 rd_count, rd, &lrm->signature);
@@ -238,14 +254,16 @@ transmit_monitor_message (void *cls,
  * @param cfg configuration to use to connect to namestore
  * @param zone zone to monitor, NULL for all zones
  * @param monitor function to call on zone changes
- * @param monitor_cls closure for 'monitor'
+ * @param sync_cb function called when we're in sync with the namestore
+ * @param cls closure for 'monitor' and 'sync_cb'
  * @return handle to stop monitoring
  */
 struct GNUNET_NAMESTORE_ZoneMonitor *
 GNUNET_NAMESTORE_zone_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                      const struct GNUNET_CRYPTO_ShortHashCode *zone,
                                      GNUNET_NAMESTORE_RecordMonitor monitor,
-                                     void *monitor_cls)
+                                     GNUNET_NAMESTORE_RecordsSynchronizedCallback sync_cb,
+                                     void *cls)
 {
   struct GNUNET_NAMESTORE_ZoneMonitor *zm;
   struct GNUNET_CLIENT_Connection *client;
@@ -260,7 +278,8 @@ GNUNET_NAMESTORE_zone_monitor_start (const struct GNUNET_CONFIGURATION_Handle *c
   else
     zm->zone = *zone;
   zm->monitor = monitor;
-  zm->monitor_cls = monitor_cls;
+  zm->sync_cb = sync_cb;
+  zm->cls = cls;
   zm->th = GNUNET_CLIENT_notify_transmit_ready (zm->h,
                                                 sizeof (struct ZoneMonitorStartMessage),
                                                 GNUNET_TIME_UNIT_FOREVER_REL,