[GNUnet-SVN] r19922 - gnunet/src/namestore

[gnunet]

Author: wachs
Date: 2012-02-22 11:52:42 +0100 (Wed, 22 Feb 2012)
New Revision: 19922

Modified:
   gnunet/src/namestore/gnunet-service-namestore.c
   gnunet/src/namestore/namestore_api.c
   gnunet/src/namestore/test_namestore_api.c
   gnunet/src/namestore/test_namestore_api.conf
Log:
- changes


Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2012-02-22 10:42:24 UTC 
(rev 19921)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2012-02-22 10:52:42 UTC 
(rev 19922)
@@ -27,6 +27,7 @@
 #include "gnunet_getopt_lib.h"
 #include "gnunet_service_lib.h"
 #include "gnunet_namestore_service.h"
+#include "namestore.h"
 
 
 /**
@@ -41,7 +42,13 @@
   /* FIXME: do clean up here */
 }
 
+static void handle_start ()
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "START");
 
+}
+
+
 /**
  * Process template requests.
  *
@@ -54,7 +61,8 @@
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {
-    /* FIXME: add handlers here! */
+    {&handle_start, NULL,
+     GNUNET_MESSAGE_TYPE_NAMESTORE_START, sizeof (struct StartMessage)},
     {NULL, NULL, 0, 0}
   };
 

Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c        2012-02-22 10:42:24 UTC (rev 
19921)
+++ gnunet/src/namestore/namestore_api.c        2012-02-22 10:52:42 UTC (rev 
19922)
@@ -137,16 +137,7 @@
 static void
 force_reconnect (struct GNUNET_NAMESTORE_Handle *nsh);
 
-/**
- * Transmit messages from the message queue to the service
- * (if there are any, and if we are not already trying).
- *
- * @param nsh handle to use
- */
-static void
-do_transmit (struct GNUNET_NAMESTORE_Handle *nsh);
 
-
 /**
  * Type of a function to call when we receive a message
  * from the service.
@@ -185,7 +176,18 @@
     force_reconnect (nsh);
 }
 
+
 /**
+ * Transmit messages from the message queue to the service
+ * (if there are any, and if we are not already trying).
+ *
+ * @param nsh handle to use
+ */
+static void
+do_transmit (struct GNUNET_NAMESTORE_Handle *nsh);
+
+
+/**
  * We can now transmit a message to NAMESTORE. Do it.
  *
  * @param cls the 'struct GNUNET_NAMESTORE_Handle'

Modified: gnunet/src/namestore/test_namestore_api.c
===================================================================
--- gnunet/src/namestore/test_namestore_api.c   2012-02-22 10:42:24 UTC (rev 
19921)
+++ gnunet/src/namestore/test_namestore_api.c   2012-02-22 10:52:42 UTC (rev 
19922)
@@ -31,6 +31,7 @@
 
 static int res;
 
+
 static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -67,7 +68,6 @@
 {
   int ret;
 
-
   ret = check ();
 
   return ret;

Modified: gnunet/src/namestore/test_namestore_api.conf
===================================================================
--- gnunet/src/namestore/test_namestore_api.conf        2012-02-22 10:42:24 UTC 
(rev 19921)
+++ gnunet/src/namestore/test_namestore_api.conf        2012-02-22 10:52:42 UTC 
(rev 19922)
@@ -1,3 +1,8 @@
+[arm]
+PORT = 12000
+DEFAULTSERVICES = namestore
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+
 [namestore]
 AUTOSTART = YES
 UNIXPATH = /tmp/gnunet-service-namestore.sock
@@ -26,5 +31,3 @@
 # HOST = localhost
 # PORT = 3306
 
-
-