Merge remote-tracking branch 'origin/master' into credentials
[oweals/gnunet.git] / src / namestore / namestore_api_monitor.c
index 7e75b07e54f4b3f938a82e34eae74ade85db6cc3..cd7c7dadba1793a1dccfe83c945863c47aa9c7df 100644 (file)
@@ -243,15 +243,15 @@ mq_error_handler (void *cls,
 static void
 reconnect (struct GNUNET_NAMESTORE_ZoneMonitor *zm)
 {
-  GNUNET_MQ_hd_fixed_size (sync,
-                           GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_SYNC,
-                           struct GNUNET_MessageHeader);
-  GNUNET_MQ_hd_var_size (result,
-                         GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT,
-                         struct RecordResultMessage);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_sync_handler (zm),
-    make_result_handler (zm),
+    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;
@@ -262,7 +262,7 @@ reconnect (struct GNUNET_NAMESTORE_ZoneMonitor *zm)
     GNUNET_MQ_destroy (zm->mq);
     zm->error_cb (zm->error_cb_cls);
   }
-  zm->mq = GNUNET_CLIENT_connecT (zm->cfg,
+  zm->mq = GNUNET_CLIENT_connect (zm->cfg,
                                   "namestore",
                                   handlers,
                                   &mq_error_handler,