-fixes in monitoring code

3 files changed, 11 insertions, 28 deletions

diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index eb1dc17b8..d43e5110d 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -2020,9 +2020,10 @@ handle_monitor_start (void *cls,
   }
   GNUNET_CONTAINER_DLL_insert (monitor_head, monitor_tail, zm);
   GNUNET_SERVER_client_mark_monitor (client);
+  GNUNET_SERVER_disable_receive_done_warning (client);
   GNUNET_SERVER_notification_context_add (monitor_nc,
                                           client);
-  zm->task = GNUNET_SCHEDULER_add_now (&monitor_next, zm);
+  zm->task = GNUNET_SCHEDULER_add_now (&monitor_next, zm);  
 }
 
 
diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c
index 8f6aacf19..a6a014839 100644
--- a/src/namestore/namestore_api_monitor.c
+++ b/src/namestore/namestore_api_monitor.c
@@ -205,10 +205,10 @@ handle_updates (void *cls,
                            &handle_updates,
                            zm,
                            GNUNET_TIME_UNIT_FOREVER_REL);
-    zm->monitor(zm->cls, 
-                &lrm->public_key, expire, 
-                name_tmp, 
-                rd_count, rd, &lrm->signature);
+    zm->monitor (zm->cls, 
+                 &lrm->public_key, expire, 
+                 name_tmp, 
+                 rd_count, rd, NULL);
   }
 }
 
@@ -229,12 +229,15 @@ transmit_monitor_message (void *cls,
   struct GNUNET_NAMESTORE_ZoneMonitor *zm = cls;
   struct ZoneMonitorStartMessage sm;
 
+  zm->th = NULL;
   if (size < sizeof (struct ZoneMonitorStartMessage))
   {    
     reconnect (zm);
     return 0;
   }
- 
+  sm.gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_START);
+  sm.gns_header.header.size = htons (sizeof (struct ZoneMonitorStartMessage));
+  sm.gns_header.r_id = htonl (0);
   sm.zone = zm->zone;
   sm.all_zones = htonl (zm->all_zones);
   memcpy (buf, &sm, sizeof (sm));
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c
index a55e8b525..b3147c43a 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -159,28 +159,7 @@ zone_proc (void *cls,
            const struct GNUNET_NAMESTORE_RecordData *rd,
            const struct GNUNET_CRYPTO_EccSignature *signature)
 {
-  fprintf (stderr,
-           "Monitor cb for %s\n",
-           name);
-  if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature (zone_key,
-                                                      expire, name, 
-                                                      rd_count, rd, 
-                                                      signature))
-  {
-    struct GNUNET_HashCode zone_key_hash;
-
-    GNUNET_CRYPTO_hash (zone_key, 
-                        sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
-                        &zone_key_hash);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-                "Verifying signature for `%s' in zone `%s' with %u records  and expiration %llu failed\n", 
-                name, 
-                GNUNET_h2s(&zone_key_hash),
-                rd_count,
-                expire.abs_value);    
-    GNUNET_break (0);
-  }
-  
+  GNUNET_break (NULL == signature);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Comparing results name %s\n", 
               name);