1 files changed, 93 insertions, 42 deletions

diff --git a/src/ext/gnunet-service-ext.c b/src/ext/gnunet-service-ext.c
index 7876047..d292eac 100644
--- a/src/ext/gnunet-service-ext.c
+++ b/src/ext/gnunet-service-ext.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C)
+     Copyright (C) 20xx 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
@@ -28,24 +28,55 @@
 #include "gnunet_protocols_ext.h"
 
 /**
+ * Some state we track per client.
+ */
+struct ClientContext
+{
+  /**
+   * For telling service to continue processing more messages.
+   */
+  struct GNUNET_SERVICE_Client *c;
+
+  /**
+   * For sending messages to the client.
+   */
+  struct GNUNET_MQ_Handle *mq;
+
+  /**
+   * Sample state.
+   */
+  uint32_t state;
+};
+
+
+/**
  * Our configuration.
  */
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
+
 /**
  * Handle EXT-message.
  *
- * @param cls closure
- * @param client identification of the client
+ * @param cls identification of the client
  * @param message the actual message
  */
 static void
 handle_ext (void *cls,
-            struct GNUNET_SERVER_Client *client,
             const struct GNUNET_MessageHeader *message)
 {
-  GNUNET_SERVER_receive_done (client,
-                              GNUNET_OK);
+  struct ClientContext *cc = cls;
+  struct GNUNET_MQ_Envelope *env;
+  struct GNUNET_MessageHeader *response;
+
+  /* Send same type of message back... */
+  env = GNUNET_MQ_msg (response,
+                       GNUNET_MESSAGE_TYPE_EXT);
+  GNUNET_MQ_send (cc->mq,
+                  env);
+
+  /* Continue processing more messages from client */
+  GNUNET_SERVICE_client_continue (cc->c);
 }
 
 
@@ -57,19 +88,7 @@ handle_ext (void *cls,
 static void
 shutdown_task (void *cls)
 {
-}
-
-
-/**
- * A client disconnected.  Remove all of its data structure entries.
- *
- * @param cls closure, NULL
- * @param client identification of the client
- */
-static void
-handle_client_disconnect (void *cls,
-                          struct GNUNET_SERVER_Client * client)
-{
+  /* Clean up whatever #run() setup here. */
 }
 
 
@@ -85,37 +104,69 @@ run (void *cls,
      struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  static const struct GNUNET_SERVER_MessageHandler handlers[] = {
-    {&handle_ext, NULL, GNUNET_MESSAGE_TYPE_EXT, 0},
-    {NULL, NULL, 0, 0}
-  };
   cfg = c;
-  GNUNET_SERVER_add_handlers (server, handlers);
-  GNUNET_SERVER_disconnect_notify (server,
-                                   &handle_client_disconnect,
-                                   NULL);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &shutdown_task,
-                                NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+                                 NULL);
+}
+
+
+/**
+ * Callback called when a client connects to the service.
+ *
+ * @param cls closure for the service
+ * @param c the new client that connected to the service
+ * @param mq the message queue used to send messages to the client
+ * @return @a c
+ */
+static void *
+client_connect_cb (void *cls,
+                   struct GNUNET_SERVICE_Client *c,
+                   struct GNUNET_MQ_Handle *mq)
+{
+  struct ClientContext *cc;
+
+  cc = GNUNET_new (struct ClientContext);
+  cc->c = c;
+  cc->mq = mq;
+  /* setup more for new client here */
+  return cc;
 }
 
 
 /**
- * The main function for the ext service.
+ * Callback called when a client disconnected from the service
  *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
+ * @param cls closure for the service
+ * @param c the client that disconnected
+ * @param internal_cls our `struct ClientContext`
  */
-int
-main (int argc, char *const *argv)
+static void
+client_disconnect_cb (void *cls,
+                      struct GNUNET_SERVICE_Client *c,
+                      void *internal_cls)
 {
-  return (GNUNET_OK ==
-          GNUNET_SERVICE_run (argc,
-                              argv,
-                              "ext",
-                              GNUNET_SERVICE_OPTION_NONE,
-                              &run, NULL)) ? 0 : 1;
+  struct ClientContext *cc = internal_cls;
+
+  GNUNET_assert (cc->c == c);
+  /* Tear down rest of client here */
+  GNUNET_free (cc);
 }
 
+
+/**
+ * Define "main" method using service macro.
+ */
+GNUNET_SERVICE_MAIN
+("ext",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run,
+ &client_connect_cb,
+ &client_disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_fixed_size (ext,
+                          GNUNET_MESSAGE_TYPE_EXT,
+                          struct GNUNET_MessageHeader,
+                          NULL),
+ GNUNET_MQ_handler_end ());
+
 /* end of gnunet-service-ext.c */