[GNUnet-SVN] r29330 - in gnunet: . src src/psycstore

[gnunet]

Author: tg
Date: 2013-09-16 18:05:58 +0200 (Mon, 16 Sep 2013)
New Revision: 29330

Modified:
   gnunet/configure.ac
   gnunet/src/Makefile.am
   gnunet/src/psycstore/gnunet-service-psycstore.c
   gnunet/src/psycstore/psycstore.h
   gnunet/src/psycstore/test_psycstore.c
   gnunet/src/psycstore/test_psycstore.conf
Log:
psyc service skeleton

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-09-16 15:51:11 UTC (rev 29329)
+++ gnunet/configure.ac 2013-09-16 16:05:58 UTC (rev 29330)
@@ -1311,7 +1311,6 @@
 src/hello/Makefile
 src/identity/Makefile
 src/identity/identity.conf
-src/psycstore/Makefile
 src/include/Makefile
 src/include/gnunet_directories.h
 src/integration-tests/Makefile
@@ -1332,6 +1331,9 @@
 src/peerinfo/peerinfo.conf
 src/peerinfo-tool/Makefile
 src/postgres/Makefile
+src/psyc/Makefile
+src/psyc/psyc.conf
+src/psycstore/Makefile
 src/psycstore/psycstore.conf
 src/pt/Makefile
 src/regex/Makefile

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2013-09-16 15:51:11 UTC (rev 29329)
+++ gnunet/src/Makefile.am      2013-09-16 16:05:58 UTC (rev 29330)
@@ -11,8 +11,13 @@
 endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = dv multicast $(CONSENSUS) $(EXPERIMENTATION) 
-#note: scalarproduct is not being listed here yet as the crypto is being 
reworked at the moment
+ EXP_DIR = \
+  dv \
+  multicast \
+  psyc \
+  $(CONSENSUS) \
+  $(EXPERIMENTATION)
+  # NOTE: scalarproduct is not being listed here yet as the crypto is being 
reworked at the moment
 endif
 
 if HAVE_MYSQL
@@ -23,7 +28,6 @@
  POSTGRES_DIR = postgres
 endif
 
-
 SUBDIRS = \
   include $(INTLEMU_SUBDIRS) \
   util \
@@ -67,4 +71,3 @@
   pt \
   integration-tests \
   $(EXP_DIR) 
-

Modified: gnunet/src/psycstore/gnunet-service-psycstore.c
===================================================================
--- gnunet/src/psycstore/gnunet-service-psycstore.c     2013-09-16 15:51:11 UTC 
(rev 29329)
+++ gnunet/src/psycstore/gnunet-service-psycstore.c     2013-09-16 16:05:58 UTC 
(rev 29330)
@@ -23,11 +23,8 @@
  * @brief PSYCstore service
  * @author Gabor X Toth
  * @author Christian Grothoff
- *
- * The purpose of this service is to manage private keys that
- * represent the various egos/pseudonyms/identities of a GNUnet user.
- *
  */
+
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
@@ -666,15 +663,14 @@
 
 
 /**
- * Handle PSYCstore clients.
+ * Initialize the PSYCstore service.
  *
- * @param cls closure
- * @param server the initialized server
- * @param c configuration to use
+ * @param cls Closure.
+ * @param server The initialized server.
+ * @param c Configuration to use.
  */
 static void
-run (void *cls,
-     struct GNUNET_SERVER_Handle *server,
+run (void *cls, struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
   static const struct GNUNET_SERVER_MessageHandler handlers[] = {
@@ -766,7 +762,7 @@
 
 
 /**
- * The main function for the network size estimation service.
+ * The main function for the service.
  *
  * @param argc number of arguments from the command line
  * @param argv command line arguments

Modified: gnunet/src/psycstore/psycstore.h
===================================================================
--- gnunet/src/psycstore/psycstore.h    2013-09-16 15:51:11 UTC (rev 29329)
+++ gnunet/src/psycstore/psycstore.h    2013-09-16 16:05:58 UTC (rev 29330)
@@ -24,8 +24,8 @@
  * @author Gabor X Toth
  */
 
-#ifndef PSYCSTORE_H
-#define PSYCSTORE_H
+#ifndef GNUNET_PSYCSTORE_H
+#define GNUNET_PSYCSTORE_H
 
 #include "gnunet_common.h"
 

Modified: gnunet/src/psycstore/test_psycstore.c
===================================================================
--- gnunet/src/psycstore/test_psycstore.c       2013-09-16 15:51:11 UTC (rev 
29329)
+++ gnunet/src/psycstore/test_psycstore.c       2013-09-16 16:05:58 UTC (rev 
29330)
@@ -500,13 +500,13 @@
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 #else
-  run (void *cls,
-       const struct GNUNET_CONFIGURATION_Handle *cfg,
-       struct GNUNET_TESTING_Peer *peer)
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 #endif
 {
-  end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                                 &end_badly, NULL);
+  end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+
   h = GNUNET_PSYCSTORE_connect (cfg);
   GNUNET_assert (NULL != h);
 

Modified: gnunet/src/psycstore/test_psycstore.conf
===================================================================
--- gnunet/src/psycstore/test_psycstore.conf    2013-09-16 15:51:11 UTC (rev 
29329)
+++ gnunet/src/psycstore/test_psycstore.conf    2013-09-16 16:05:58 UTC (rev 
29330)
@@ -1,7 +1,6 @@
 [arm]
 UNIXPATH = /tmp/test-gnunet-service-arm.sock
 DEFAULTSERVICES = psycstore
-GLOBAL_POSTFIX = -L DEBUG
 
 [psycstore]
 AUTOSTART = YES
@@ -11,8 +10,6 @@
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
 DATABASE = sqlite
-OPTIONS = -L DEBUG
-DEBUG = YES
 
 [psycstore-sqlite]
 FILENAME = $SERVICEHOME/psycstore/sqlite_test.db