X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Fnamestore_api_monitor.c;h=8e6d39ad7e2612bd242b6e31af6331f56fa3d029;hb=c15e7951180d954ca584a95206543e8997b3a7d4;hp=f778a1e8b0f7624c0a2f507480af26ff33b34f28;hpb=f27338992f0a5915ee974faea05f764c2df6f584;p=oweals%2Fgnunet.git

diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c
index f778a1e8b..8e6d39ad7 100644
--- a/src/namestore/namestore_api_monitor.c
+++ b/src/namestore/namestore_api_monitor.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2013, 2016 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
@@ -48,7 +48,17 @@ struct GNUNET_NAMESTORE_ZoneMonitor
   /**
    * Handle to namestore service.
    */
-  struct GNUNET_CLIENT_Connection *h;
+  struct GNUNET_MQ_Handle *mq;
+
+  /**
+   * Function to call on errors.
+   */
+  GNUNET_SCHEDULER_TaskCallback error_cb;
+
+  /**
+   * Closure for @e error_cb.
+   */
+  void *error_cb_cls;
 
   /**
    * Function to call on events.
@@ -56,19 +66,19 @@ struct GNUNET_NAMESTORE_ZoneMonitor
   GNUNET_NAMESTORE_RecordMonitor monitor;
 
   /**
-   * Function called when we've synchronized.
+   * Closure for @e monitor.
    */
-  GNUNET_NAMESTORE_RecordsSynchronizedCallback sync_cb;
+  void *monitor_cls;
 
   /**
-   * Closure for 'monitor' and 'sync_cb'.
+   * Function called when we've synchronized.
    */
-  void *cls;
+  GNUNET_SCHEDULER_TaskCallback sync_cb;
 
   /**
-   * Transmission handle to client.
+   * Closure for @e sync_cb.
    */
-  struct GNUNET_CLIENT_TransmitHandle *th;
+  void *sync_cb_cls;
 
   /**
    * Monitored zone.
@@ -84,55 +94,44 @@ struct GNUNET_NAMESTORE_ZoneMonitor
 
 
 /**
- * Send our request to start monitoring to the service.
+ * Reconnect to the namestore service.
  *
- * @param cls the monitor handle
- * @param size number of bytes available in buf
- * @param buf where to copy the message to the service
- * @return number of bytes copied to buf
+ * @param zm monitor to reconnect
  */
-static size_t
-transmit_monitor_message (void *cls,
-			  size_t size,
-			  void *buf);
+static void
+reconnect (struct GNUNET_NAMESTORE_ZoneMonitor *zm);
 
 
 /**
- * Reconnect to the namestore service.
+ * Handle SYNC message from the namestore service.
  *
- * @param zm monitor to reconnect
+ * @param cls the monitor
+ * @param msg the sync message
  */
 static void
-reconnect (struct GNUNET_NAMESTORE_ZoneMonitor *zm)
+handle_sync (void *cls,
+             const struct GNUNET_MessageHeader *msg)
 {
-  if (NULL != zm->h)
-    GNUNET_CLIENT_disconnect (zm->h);
-  zm->monitor (zm->cls,
-	       NULL,
-	       NULL, 0, NULL);
-  GNUNET_assert (NULL != (zm->h = GNUNET_CLIENT_connect ("namestore", zm->cfg)));
-  zm->th = GNUNET_CLIENT_notify_transmit_ready (zm->h,
-						sizeof (struct ZoneMonitorStartMessage),
-						GNUNET_TIME_UNIT_FOREVER_REL,
-						GNUNET_YES,
-						&transmit_monitor_message,
-						zm);
+  struct GNUNET_NAMESTORE_ZoneMonitor *zm = cls;
+
+  (void) cls;
+  (void) msg;
+  if (NULL != zm->sync_cb)
+    zm->sync_cb (zm->sync_cb_cls);
 }
 
 
 /**
  * We've received a notification about a change to our zone.
- * Forward to monitor callback.
+ * Check that it is well-formed.
  *
  * @param cls the zone monitor handle
- * @param msg the message from the service.
+ * @param lrm the message from the service.
  */
-static void
-handle_updates (void *cls,
-		const struct GNUNET_MessageHeader *msg)
+static int
+check_result (void *cls,
+              const struct RecordResultMessage *lrm)
 {
-  struct GNUNET_NAMESTORE_ZoneMonitor *zm = cls;
-  const struct RecordResultMessage *lrm;
   size_t lrm_len;
   size_t exp_lrm_len;
   size_t name_len;
@@ -141,30 +140,7 @@ handle_updates (void *cls,
   const char *name_tmp;
   const char *rd_ser_tmp;
 
-  if (NULL == msg)
-  {
-    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 RecordResultMessage)) ||
-       (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT != ntohs (msg->type) ) )
-  {
-    GNUNET_break (0);
-    reconnect (zm);
-    return;
-  }
-  lrm = (const struct RecordResultMessage *) msg;
+  (void) cls;
   lrm_len = ntohs (lrm->gns_header.header.size);
   rd_len = ntohs (lrm->rd_len);
   rd_count = ntohs (lrm->rd_count);
@@ -173,79 +149,140 @@ handle_updates (void *cls,
   if (lrm_len != exp_lrm_len)
   {
     GNUNET_break (0);
-    reconnect (zm);
-    return;
+    return GNUNET_SYSERR;
   }
   if (0 == name_len)
   {
     GNUNET_break (0);
-    reconnect (zm);
-    return;
+    return GNUNET_SYSERR;
   }
   name_tmp = (const char *) &lrm[1];
   if ((name_tmp[name_len -1] != '\0') || (name_len > MAX_NAME_LEN))
   {
     GNUNET_break (0);
-    reconnect (zm);
-    return;
+    return GNUNET_SYSERR;
   }
   rd_ser_tmp = (const char *) &name_tmp[name_len];
   {
     struct GNUNET_GNSRECORD_Data rd[rd_count];
 
-    if (GNUNET_OK != GNUNET_GNSRECORD_records_deserialize (rd_len, rd_ser_tmp, rd_count, rd))
+    if (GNUNET_OK !=
+        GNUNET_GNSRECORD_records_deserialize (rd_len,
+                                              rd_ser_tmp,
+                                              rd_count,
+                                              rd))
     {
       GNUNET_break (0);
-      reconnect (zm);
-      return;
+      return GNUNET_SYSERR;
     }
-    GNUNET_CLIENT_receive (zm->h,
-			   &handle_updates,
-			   zm,
-			   GNUNET_TIME_UNIT_FOREVER_REL);
-    zm->monitor (zm->cls,
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * We've received a notification about a change to our zone.
+ * Forward to monitor callback.
+ *
+ * @param cls the zone monitor handle
+ * @param lrm the message from the service.
+ */
+static void
+handle_result (void *cls,
+               const struct RecordResultMessage *lrm)
+{
+  struct GNUNET_NAMESTORE_ZoneMonitor *zm = cls;
+  size_t name_len;
+  size_t rd_len;
+  unsigned rd_count;
+  const char *name_tmp;
+  const char *rd_ser_tmp;
+
+  rd_len = ntohs (lrm->rd_len);
+  rd_count = ntohs (lrm->rd_count);
+  name_len = ntohs (lrm->name_len);
+  name_tmp = (const char *) &lrm[1];
+  rd_ser_tmp = (const char *) &name_tmp[name_len];
+  {
+    struct GNUNET_GNSRECORD_Data rd[rd_count];
+
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_GNSRECORD_records_deserialize (rd_len,
+                                                         rd_ser_tmp,
+                                                         rd_count,
+                                                         rd));
+    zm->monitor (zm->monitor_cls,
 		 &lrm->private_key,
 		 name_tmp,
-		 rd_count, rd);
+		 rd_count,
+                 rd);
   }
 }
 
 
 /**
- * Send our request to start monitoring to the service.
+ * Generic error handler, called with the appropriate error code and
+ * the same closure specified at the creation of the message queue.
+ * Not every message queue implementation supports an error handler.
  *
- * @param cls the monitor handle
- * @param size number of bytes available in buf
- * @param buf where to copy the message to the service
- * @return number of bytes copied to buf
+ * @param cls closure with the `struct GNUNET_NAMESTORE_ZoneMonitor *`
+ * @param error error code
  */
-static size_t
-transmit_monitor_message (void *cls,
-			  size_t size,
-			  void *buf)
+static void
+mq_error_handler (void *cls,
+                  enum GNUNET_MQ_Error error)
 {
   struct GNUNET_NAMESTORE_ZoneMonitor *zm = cls;
-  struct ZoneMonitorStartMessage sm;
 
-  zm->th = NULL;
-  if (size < sizeof (struct ZoneMonitorStartMessage))
+  (void) error;
+  reconnect (zm);
+}
+
+
+/**
+ * Reconnect to the namestore service.
+ *
+ * @param zm monitor to reconnect
+ */
+static void
+reconnect (struct GNUNET_NAMESTORE_ZoneMonitor *zm)
+{
+  struct GNUNET_MQ_MessageHandler handlers[] = {
+    GNUNET_MQ_hd_fixed_size (sync,
+                             GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_SYNC,
+                             struct GNUNET_MessageHeader,
+                             zm),
+    GNUNET_MQ_hd_var_size (result,
+                           GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT,
+                           struct RecordResultMessage,
+                           zm),
+    GNUNET_MQ_handler_end ()
+  };
+  struct GNUNET_MQ_Envelope *env;
+  struct ZoneMonitorStartMessage *sm;
+
+  if (NULL != zm->mq)
   {
-    reconnect (zm);
-    return 0;
+    GNUNET_MQ_destroy (zm->mq);
+    zm->error_cb (zm->error_cb_cls);
   }
-  sm.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START);
-  sm.header.size = htons (sizeof (struct ZoneMonitorStartMessage));
-  sm.iterate_first = htonl (zm->iterate_first);
-  sm.zone = zm->zone;
-  memcpy (buf, &sm, sizeof (sm));
-  GNUNET_CLIENT_receive (zm->h,
-			 &handle_updates,
-			 zm,
-			 GNUNET_TIME_UNIT_FOREVER_REL);
-  return sizeof (sm);
+  zm->mq = GNUNET_CLIENT_connect (zm->cfg,
+                                  "namestore",
+                                  handlers,
+                                  &mq_error_handler,
+                                  zm);
+  if (NULL == zm->mq)
+    return;
+  env = GNUNET_MQ_msg (sm,
+                       GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START);
+  sm->iterate_first = htonl (zm->iterate_first);
+  sm->zone = zm->zone;
+  GNUNET_MQ_send (zm->mq,
+                  env);
 }
 
 
+
 /**
  * Begin monitoring a zone for changes.  If @a iterate_first is set,
  * we Will first call the @a monitor function on all existing records
@@ -256,39 +293,48 @@ transmit_monitor_message (void *cls,
  * @param zone zone to monitor
  * @param iterate_first #GNUNET_YES to first iterate over all existing records,
  *                      #GNUNET_NO to only return changes that happen from now on
+ * @param error_cb function to call on error (i.e. disconnect); note that
+ *         unlike the other error callbacks in this API, a call to this
+ *         function does NOT destroy the monitor handle, it merely signals
+ *         that monitoring is down. You need to still explicitly call
+ *         #GNUNET_NAMESTORE_zone_monitor_stop().
+ * @param error_cb_cls closure for @a error_cb
  * @param monitor function to call on zone changes
+ * @param monitor_cls closure for @a monitor
  * @param sync_cb function called when we're in sync with the namestore
- * @param cls closure for @a monitor and @a sync_cb
+ * @param cls closure for @a 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_EcdsaPrivateKey *zone,
                                      int iterate_first,
+                                     GNUNET_SCHEDULER_TaskCallback error_cb,
+                                     void *error_cb_cls,
 				     GNUNET_NAMESTORE_RecordMonitor monitor,
-				     GNUNET_NAMESTORE_RecordsSynchronizedCallback sync_cb,
-				     void *cls)
+                                     void *monitor_cls,
+				     GNUNET_SCHEDULER_TaskCallback sync_cb,
+				     void *sync_cb_cls)
 {
   struct GNUNET_NAMESTORE_ZoneMonitor *zm;
-  struct GNUNET_CLIENT_Connection *client;
 
-  if (NULL == (client = GNUNET_CLIENT_connect ("namestore", cfg)))
-    return NULL;
   zm = GNUNET_new (struct GNUNET_NAMESTORE_ZoneMonitor);
-  zm->cfg = cfg;
-  zm->h = client;
   if (NULL != zone)
     zm->zone = *zone;
   zm->iterate_first = iterate_first;
+  zm->error_cb = error_cb;
+  zm->error_cb_cls = error_cb_cls;
   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,
-						GNUNET_YES,
-						&transmit_monitor_message,
-						zm);
+  zm->sync_cb_cls = sync_cb_cls;
+  zm->cfg = cfg;
+  reconnect (zm);
+  if (NULL == zm->mq)
+  {
+    GNUNET_free (zm);
+    return NULL;
+  }
   return zm;
 }
 
@@ -301,12 +347,11 @@ GNUNET_NAMESTORE_zone_monitor_start (const struct GNUNET_CONFIGURATION_Handle *c
 void
 GNUNET_NAMESTORE_zone_monitor_stop (struct GNUNET_NAMESTORE_ZoneMonitor *zm)
 {
-  if (NULL != zm->th)
+  if (NULL != zm->mq)
   {
-    GNUNET_CLIENT_notify_transmit_ready_cancel (zm->th);
-    zm->th = NULL;
+    GNUNET_MQ_destroy (zm->mq);
+    zm->mq = NULL;
   }
-  GNUNET_CLIENT_disconnect (zm->h);
   GNUNET_free (zm);
 }