[GNUnet-SVN] r24824 - in gnunet: contrib src/mesh

[gnunet]

Author: szengel
Date: 2012-11-07 18:23:12 +0100 (Wed, 07 Nov 2012)
New Revision: 24824

Modified:
   gnunet/contrib/regex_profiler_infiniband.conf
   gnunet/src/mesh/gnunet-service-regexprofiler.c
Log:
- regexprofiler service to daemon
- enabling nse in regex profiler



Modified: gnunet/contrib/regex_profiler_infiniband.conf
===================================================================
--- gnunet/contrib/regex_profiler_infiniband.conf       2012-11-07 16:56:55 UTC 
(rev 24823)
+++ gnunet/contrib/regex_profiler_infiniband.conf       2012-11-07 17:23:12 UTC 
(rev 24824)
@@ -9,10 +9,8 @@
 MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 50
 
 [regexprofiler]
-AUTOSTART = YES
-PORT = 12000
 BINARY = /home/szengel/gnunet/src/mesh/.libs/gnunet-service-regexprofiler
-REGEX_PREFIX = "GNVPN-0001-PADP"
+REGEX_PREFIX = "GNVPN-0001-PAD"
 
 [mesh]
 AUTOSTART = YES
@@ -26,7 +24,7 @@
 [dht]
 AUTOSTART = YES
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
-PORT = 12002
+#PORT = 12002
 HOSTNAME = localhost
 DISABLE_TRY_CONNECT = YES
 
@@ -36,7 +34,7 @@
 
 [arm]
 DEFAULTSERVICES = core mesh dht statistics regexprofiler
-PORT = 12003
+#PORT = 12003
 
 [fs]
 AUTOSTART = NO
@@ -60,7 +58,7 @@
 WAN_QUOTA_IN = 3932160
 
 [core]
-PORT = 12005
+#PORT = 12005
 AUTOSTART = YES
 
 [transport-tcp]
@@ -96,7 +94,8 @@
 AUTOSTART = NO
 
 [nse]
-AUTOSTART = NO
+AUTOSTART = YES
+WORKBITS = 1
 
 [vpn]
 AUTOSTART = NO

Modified: gnunet/src/mesh/gnunet-service-regexprofiler.c
===================================================================
--- gnunet/src/mesh/gnunet-service-regexprofiler.c      2012-11-07 16:56:55 UTC 
(rev 24823)
+++ gnunet/src/mesh/gnunet-service-regexprofiler.c      2012-11-07 17:23:12 UTC 
(rev 24824)
@@ -121,15 +121,16 @@
 
 
 /**
- * Main function that will be run by the scheduler.
+ * @brief Main function that will be run by the scheduler.
  *
  * @param cls closure
- * @param server the initialized server
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be 
NULL!)
  * @param cfg_ configuration
  */
 static void
-run (void *cls,
-     struct GNUNET_SERVER_Handle *server,
+run (void *cls, char *const *args GNUNET_UNUSED,
+     const char *cfgfile GNUNET_UNUSED,
      const struct GNUNET_CONFIGURATION_Handle *cfg_)
 {
   char *regex;
@@ -257,10 +258,18 @@
 int
 main (int argc, char *const *argv)
 {
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+    return 2;
+
   return (GNUNET_OK ==
-          GNUNET_SERVICE_run (argc, argv, "regexprofiler",
-                              GNUNET_SERVICE_OPTION_NONE,
-                              &run, NULL)) ? global_ret : 1;
+          GNUNET_PROGRAM_run (argc, argv, "regexprofiler",
+                              gettext_noop
+                             ("Daemon to announce regular expressions for the 
peer using mesh."),
+                              options, &run, NULL)) ? global_ret : 1;
 }