5 files changed, 118 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index 56675cbaa..178fdf94a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1265,6 +1265,7 @@ src/peerinfo-tool/Makefile
 src/postgres/Makefile
 src/pt/Makefile
 src/regex/Makefile
+src/regex/regex.conf
 src/set/Makefile
 src/set/set.conf
 src/statistics/Makefile
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am
index e88938054..f57b78611 100644
--- a/src/regex/Makefile.am
+++ b/src/regex/Makefile.am
@@ -8,6 +8,32 @@ if USE_COVERAGE
   AM_CFLAGS = --coverage
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+pkgcfg_DATA = \
+  regex.conf
+
+libexec_PROGRAMS = \
+  gnunet-service-regex
+
+gnunet_service_regex_SOURCES =  \
+ gnunet-service-regex.c
+gnunet_service_regex_LDADD =  \
+ $(top_builddir)/src/regex/libgnunetregex.la \
+ $(top_builddir)/src/dht/libgnunetdht.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(GN_LIBINTL) 
+gnunet_service_regex_DEPENDENCIES = \
+  libgnunetregex.la
+# todo: link files from libgnunetregex statically into gnunet_service_regex,
+# rename API prefix to avoid collision with 'libgnunetregexnew'...
+
+# FIXME: shouldn't the block library be in the plugin directory!?
 lib_LTLIBRARIES = libgnunetregexblock.la \
   libgnunetregex.la \
   libgnunetregexnew.la
diff --git a/src/regex/gnunet-service-regex.c b/src/regex/gnunet-service-regex.c
new file mode 100644
index 000000000..e88d8c336
--- /dev/null
+++ b/src/regex/gnunet-service-regex.c
@@ -0,0 +1,81 @@
+/*
+     This file is part of GNUnet.
+     (C) 2013 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file regex/gnunet-service-regex.c
+ * @brief program that tracks template
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_regex_lib.h"
+#include "regex_ipc.h"
+
+/**
+ * Task run during shutdown.
+ *
+ * @param cls unused
+ * @param tc unused
+ */
+static void
+cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  /* FIXME: do clean up here */
+}
+
+
+/**
+ * Process regex requests.
+ *
+ * @param cls closure
+ * @param server the initialized server
+ * @param cfg configuration to use
+ */
+static void
+run (void *cls, struct GNUNET_SERVER_Handle *server,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  static const struct GNUNET_SERVER_MessageHandler handlers[] = {
+    /* FIXME: add handlers here! */
+    {NULL, NULL, 0, 0}
+  };
+  /* FIXME: do setup here */
+  GNUNET_SERVER_add_handlers (server, handlers);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task,
+                                NULL);
+}
+
+
+/**
+ * The main function for the regex service.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+  return (GNUNET_OK ==
+          GNUNET_SERVICE_run (argc, argv, "regex",
+                              GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1;
+}
+
+/* end of gnunet-service-regex.c */
diff --git a/src/regex/regex.conf.in b/src/regex/regex.conf.in
new file mode 100644
index 000000000..020b5616d
--- /dev/null
+++ b/src/regex/regex.conf.in
@@ -0,0 +1,8 @@
+[regex]
+AUTOSTART = YES
+@UNIXONLY@ PORT = 2107
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+BINARY = gnunet-service-regex
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
diff --git a/src/template/gnunet-service-template.c b/src/template/gnunet-service-template.c
index 54b7ecc94..9b6ae4849 100644
--- a/src/template/gnunet-service-template.c
+++ b/src/template/gnunet-service-template.c
@@ -20,12 +20,11 @@
 
 /**
  * @file template/gnunet-service-template.c
- * @brief program that tracks template
+ * @brief program that does template
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_service_lib.h"
+#include "gnunet_util_lib.h"
 
 
 /**