- commit after up, ty!

1 files changed, 105 insertions, 76 deletions

diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 25e066d00..ca732c78e 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -27,14 +27,19 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
 #include "gnunet_dns_service.h"
+#include "gnunet_dnsparser_lib.h"
 #include "gnunet_gns_service.h"
-#include "gnunet-service-gns.h"
+#include "gns.h"
 
 
+/* TODO into gnunet_protocols */
+#define GNUNET_MESSAGE_TYPE_GNS_CLIENT_LOOKUP 23
+#define GNUNET_MESSAGE_TYPE_GNS_CLIENT_RESULT 24
+
 /**
  * Our handle to the DNS handler library
  */
-struct GNUNET_DNS_Handle *dns_handler;
+struct GNUNET_DNS_Handle *dns_handle;
 
 /**
  * The configuration the GNS service is running with
@@ -42,6 +47,11 @@ struct GNUNET_DNS_Handle *dns_handler;
 const struct GNUNET_CONFIGURATION_Handle *GNS_cfg;
 
 /**
+ * Our notification context.
+ */
+static struct GNUNET_SERVER_NotificationContext *nc;
+
+/**
  * Task run during shutdown.
  *
  * @param cls unused
@@ -50,7 +60,7 @@ const struct GNUNET_CONFIGURATION_Handle *GNS_cfg;
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-        GNUNET_DNS_disconnect(dns_handle);
+  GNUNET_DNS_disconnect(dns_handle);
 }
 
 /**
@@ -63,55 +73,74 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  */
 void
 handle_dns_request(void *cls,
-                                                                         struct GNUNET_DNS_RequestHandle *rh,
-                                                                         size_t request_length,
-                                                                         const char *request)
+                   struct GNUNET_DNS_RequestHandle *rh,
+                   size_t request_length,
+                   const char *request)
 {
-        /**
-         * TODO: parse request for tld
-         * Queue rh and gns handle (or use cls)
-         * How should lookup behave:
-         *  - sync and return result or "NX"
-         *  - async like dht with iter
-         *  Maybe provide both, useful for cli app
-         **/
+  /**
+   * TODO: parse request for tld
+   * Queue rh and gns handle (or use cls)
+   * How should lookup behave:
+   *  - sync and return result or "NX"
+   *  - async like dht with iter
+   *  Maybe provide both, useful for cli app
+   **/
   struct GNUNET_DNSPARSER_Packet *p;
-        int namelen;
-        
-        p = GNUNET_DNSPARSER_parse (request, request_length);
-        if (NULL == p)
-        {
-                fprintf (stderr, "Received malformed DNS packet, leaving it untouched\n");
-                GNUNET_DNS_request_forward (rh);
-                return;
-        }
-        /**
-         * TODO factor out
-         * Check tld and decide if we or
-         * legacy dns is responsible
-         **/
-        for (i=0;i<p->num_queries;i++)
-        {
-                namelen = strlen(&p->queries[i]->name);
-                if (namelen >= 7)
-                {
-                        /**
-                         * TODO off by 1?
-                         * Move our tld/root to config file
-                         * Generate fake DNS reply that replaces .gnunet with .org
-                         **/
-                        if (0 == strcmp((&p->queries[i]->name)+(namelen-7), ".gnunet"))
-                        {
-                                GNUNET_DNS_request_answer(rh, 0 /*length*/, NULL/*reply*/);
-                        }
-                        else
-                        {
-                                GNUNET_DNS_request_forward (rh);
-                        }
-                }
-        }
+  int namelen;
+  int i;
+  char *tail;
+  
+  p = GNUNET_DNSPARSER_parse (request, request_length);
+  if (NULL == p)
+  {
+    fprintf (stderr, "Received malformed DNS packet, leaving it untouched\n");
+    GNUNET_DNS_request_forward (rh);
+    return;
+  }
+  /**
+   * TODO factor out
+   * Check tld and decide if we or
+   * legacy dns is responsible
+   **/
+  for (i=0;i<p->num_queries;i++)
+  {
+    namelen = strlen(p->queries[i].name);
+    if (namelen >= 7)
+    {
+      /**
+       * TODO off by 1?
+       * Move our tld/root to config file
+       * Generate fake DNS reply that replaces .gnunet with .org
+       **/
+      tail = p->queries[i].name+(namelen-7);
+      if (0 == strcmp(tail, ".gnunet"))
+      {
+        /* Do db lookup here. Make dht lookup if necessary */
+        GNUNET_DNS_request_answer(rh, 0 /*length*/, NULL/*reply*/);
+      }
+      else
+      {
+        GNUNET_DNS_request_forward (rh);
+      }
+    }
+  }
 }
 
+/*TODO*/
+static void
+handle_client_record_lookup(void *cls,
+                            struct GNUNET_SERVER_Client *client,
+                            const struct GNUNET_MessageHeader *message)
+{
+}
+
+/*TODO*/
+static void
+handle_client_record_add(void *cls,
+                         struct GNUNET_SERVER_Client *client,
+                         const struct GNUNET_MessageHeader *message)
+{
+}
 
 /**
  * Process GNS requests.
@@ -124,35 +153,35 @@ static void
 run (void *cls, struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-        /* The IPC message types */
-        static const struct GNUNET_SERVER_MessageHandler handlers[] = {
-                /* callback, cls, type, size */
-                {&handle_client_record_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_RECORD_LOOKUP,
-                        sizeof (struct GNUNET_GNS_Lookup)},
-                {&handle_client_record_add, NULL, GNUNET_MESSAGE_TYPE_GNS_RECORD_ADD,
-                        sizeof (struct GNUNET_GNS_Record)},
-                {NULL, NULL, 0, 0}
-        };
-        
-        nc = GNUNET_SERVER_notification_context_create (server, 1);
-
-        /* TODO do some config parsing */
-
-        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+  /* The IPC message types */
+  static const struct GNUNET_SERVER_MessageHandler handlers[] = {
+    /* callback, cls, type, size */
+    {&handle_client_record_lookup, NULL, GNUNET_MESSAGE_TYPE_GNS_CLIENT_LOOKUP,
+      0},
+    /*{&handle_client_record_add, NULL, GNUNET_MESSAGE_TYPE_GNS_CLIENT_ADD,
+      0},*/
+    {NULL, NULL, 0, 0}
+  };
+  
+  nc = GNUNET_SERVER_notification_context_create (server, 1);
+
+  /* TODO do some config parsing */
+
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                 NULL);
-        /**
-         * Do gnunet dns init here
-         * */
-        dns_handle = GNUNET_DNS_connect(c,
-                                                                                                                                        GNUNET_DNS_FLAG_PRE_RESOLUTION,
-                                                                                                                                        &handle_dns_request, /* rh */
-                                                                                                                                        NULL); /* Closure */
-        GNUNET_SERVER_add_handlers (server, handlers);
-        /**
-         * Esp the lookup would require to keep track of the clients' context
-         * See dht.
-         * GNUNET_SERVER_disconnect_notify (server, &client_disconnect, NULL);
-         **/
+  /**
+   * Do gnunet dns init here
+   * */
+  dns_handle = GNUNET_DNS_connect(c,
+                                  GNUNET_DNS_FLAG_PRE_RESOLUTION,
+                                  &handle_dns_request, /* rh */
+                                  NULL); /* Closure */
+  GNUNET_SERVER_add_handlers (server, handlers);
+  /**
+   * Esp the lookup would require to keep track of the clients' context
+   * See dht.
+   * GNUNET_SERVER_disconnect_notify (server, &client_disconnect, NULL);
+   **/
 }