[GNUnet-SVN] r24731 - gnunet/src/mesh

[gnunet]

Author: szengel
Date: 2012-11-05 14:29:33 +0100 (Mon, 05 Nov 2012)
New Revision: 24731

Added:
   gnunet/src/mesh/gnunet-service-regexprofiler.c
   gnunet/src/mesh/regexprofiler.conf
Modified:
   gnunet/src/mesh/Makefile.am
Log:
Adding new regexprofiler service that is used in conjunction with the
gnunet-regex-profiler to announce regexes from a policy file 


Modified: gnunet/src/mesh/Makefile.am
===================================================================
--- gnunet/src/mesh/Makefile.am 2012-11-05 13:26:23 UTC (rev 24730)
+++ gnunet/src/mesh/Makefile.am 2012-11-05 13:29:33 UTC (rev 24731)
@@ -115,7 +115,8 @@
 
 
 noinst_PROGRAMS = \
-gnunet-regex-profiler
+  gnunet-regex-profiler \
+  gnunet-service-regexprofiler
 
 gnunet_regex_profiler_SOURCES = \
   gnunet-regex-profiler.c
@@ -128,6 +129,14 @@
 gnunet_regex_profiler_DEPENDENCIES = \
   libgnunetmesh.la
 
+gnunet_service_regexprofiler_SOURCES = \
+  gnunet-service-regexprofiler.c
+gnunet_service_regexprofiler_LDADD = \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la
+gnunet_service_regexprofiler_DEPENDENCIES = \
+  libgnunetmesh.la
+
 check_PROGRAMS = \
  test_mesh_api \
  test_mesh_tree_api \
@@ -332,4 +341,3 @@
   test_mesh_2dtorus.conf \
   test_mesh_small.conf \
   regex_profiler_test.conf
-

Added: gnunet/src/mesh/gnunet-service-regexprofiler.c
===================================================================
--- gnunet/src/mesh/gnunet-service-regexprofiler.c                              
(rev 0)
+++ gnunet/src/mesh/gnunet-service-regexprofiler.c      2012-11-05 13:29:33 UTC 
(rev 24731)
@@ -0,0 +1,289 @@
+/*
+     This file is part of GNUnet.
+     (C) 2010, 2011, 2012 Christian Grothoff
+
+     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 mesh/gnunet-service-regexprofiler.c
+ * @brief service that uses mesh to announce a regular expression. Used in
+ * conjunction with gnunet-regex-profiler to announce regexes on serveral peers
+ * without the need to explicitly connect to the mesh service running on the
+ * peer from within the profiler.
+ * @author Maximilian Szengel
+ */
+#include "platform.h"
+#include "gnunet_mesh_service.h"
+#include "gnunet_statistics_service.h"
+
+/**
+ * Return value from 'main'.
+ */
+static int global_ret;
+
+/**
+ * Configuration we use.
+ */
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * Handle to server.
+ */
+static struct GNUNET_SERVER_Handle *server_handle;
+
+/**
+ * Handle to the statistics service.
+ */
+static struct GNUNET_STATISTICS_Handle *stats_handle;
+
+/**
+ * Peer's mesh handle.
+ */
+struct GNUNET_MESH_Handle *mesh_handle;
+
+/**
+ * Peer's mesh tunnel handle.
+ */
+struct GNUNET_MESH_Tunnel *mesh_tunnel_handle;
+
+/**
+ * Maximal path compression length for regex announcing.
+ */
+static unsigned long long max_path_compression;
+
+/**
+ * Name of the file containing policies that this peer should announce. One
+ * policy per line.
+ */
+static char * policy_filename;
+
+
+/**
+ * Task run during shutdown.
+ *
+ * @param cls unused
+ * @param tc unused
+ */
+static void
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shutting down\n");
+
+  if (NULL != mesh_tunnel_handle)
+  {
+    GNUNET_MESH_tunnel_destroy (mesh_tunnel_handle);
+    mesh_tunnel_handle = NULL;
+  }
+
+  if (NULL != mesh_handle)
+  {
+    GNUNET_MESH_disconnect (mesh_handle);
+    mesh_handle = NULL;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shut down\n");
+}
+
+
+/**
+ * Method called whenever a peer has disconnected from the tunnel.
+ * Implementations of this callback must NOT call
+ * GNUNET_MESH_tunnel_destroy immediately, but instead schedule those
+ * to run in some other task later.  However, calling
+ * "GNUNET_MESH_notify_transmit_ready_cancel" is allowed.
+ *
+ * @param cls closure
+ * @param peer_id peer identity the tunnel stopped working with
+ */
+static void
+mesh_peer_disconnect_handler (void *cls,
+                              const struct GNUNET_PeerIdentity * peer_id)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Mesh peer disconnect handler.\n");
+  GNUNET_STATISTICS_update (stats_handle, "# peers disconnected", 1, 
GNUNET_NO);
+}
+
+
+/**
+ * Method called whenever a peer has connected to the tunnel.
+ *
+ * @param cls closure
+ * @param peer_id peer identity the tunnel was created to, NULL on timeout
+ * @param atsi performance data for the connection
+ *
+ */
+static void
+mesh_peer_connect_handler (void *cls,
+                           const struct GNUNET_PeerIdentity* peer_id,
+                           const struct GNUNET_ATS_Information * atsi)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Mesh peer connect handler.\n");
+  GNUNET_STATISTICS_update (stats_handle, "# peers connected", 1, GNUNET_NO);
+}
+
+
+/**
+ * Announce the given regular expression using Mesh and the path compression
+ * length read from config.
+ *
+ * @param regex regular expression to announce on this peer's mesh.
+ */
+static void
+announce_regex (const char * regex)
+{
+  if (NULL == regex || 0 == strlen (regex))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot announce empty regex\n");
+    return;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Announcing regex: %s\n", regex);
+  GNUNET_STATISTICS_update (stats_handle, "# regexes announced", 1, GNUNET_NO);
+  GNUNET_MESH_announce_regex (mesh_handle, regex, (unsigned 
int)max_path_compression);
+}
+
+
+/**
+ * Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @param server the initialized server
+ * @param cfg_ configuration
+ */
+static void
+run (void *cls,
+     struct GNUNET_SERVER_Handle *server,
+     const struct GNUNET_CONFIGURATION_Handle *cfg_)
+{
+  char *regex;
+  char *data;
+  char *buf;
+  uint64_t filesize;
+  unsigned int offset;
+  GNUNET_MESH_ApplicationType app;
+
+  static struct GNUNET_MESH_MessageHandler handlers[] = {
+    {NULL, 0, 0}
+  };
+
+  cfg = cfg_;
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (cfg, "REGEXPROFILER", 
"MAX_PATH_COMPRESSION",
+                                             &max_path_compression))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _
+                ("%s service is lacking key configuration settings (%s).  
Exiting.\n"),
+                "regexprofiler", "max_path_compression");
+    global_ret = GNUNET_SYSERR;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_filename (cfg, "REGEXPROFILER", 
"POLICY_FILE",
+                                               &policy_filename))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _
+                ("%s service is lacking key configuration settings (%s).  
Exiting.\n"),
+                "regexprofiler", "policy_file");
+    global_ret = GNUNET_SYSERR;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+
+  stats_handle = GNUNET_STATISTICS_create ("regexprofiler", cfg);
+
+  app = (GNUNET_MESH_ApplicationType)0;
+
+  mesh_tunnel_handle = GNUNET_MESH_tunnel_create (mesh_handle,
+                                                  NULL,
+                                                  &mesh_peer_connect_handler,
+                                                  
&mesh_peer_disconnect_handler,
+                                                  NULL);
+
+  mesh_handle =
+    GNUNET_MESH_connect (cfg, mesh_tunnel_handle, NULL, NULL, handlers, &app);
+
+  /* Announcing regexes from policy_filename */
+  if (GNUNET_YES != GNUNET_DISK_file_test (policy_filename))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not find policy file %s\n", policy_filename);
+    return;
+  }
+  if (GNUNET_OK != GNUNET_DISK_file_size (policy_filename, &filesize, 
GNUNET_YES, GNUNET_YES))
+    filesize = 0;
+  if (0 == filesize)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Policy file %s is empty.\n", 
policy_filename);
+    return;
+  }
+  data = GNUNET_malloc (filesize);
+  if (filesize != GNUNET_DISK_fn_read (policy_filename, data, filesize))
+  {
+    GNUNET_free (data);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not read policy file %s.\n",
+                policy_filename);
+    return;
+  }
+  buf = data;
+  offset = 0;
+  regex = NULL;
+  while (offset < (filesize - 1))
+  {
+    offset++;
+    if (((data[offset] == '\n')) && (buf != &data[offset]))
+    {
+      data[offset] = '\0';
+      regex = buf;
+      GNUNET_assert (NULL != regex);
+      announce_regex (regex);
+      buf = &data[offset + 1];
+    }
+    else if ((data[offset] == '\n') || (data[offset] == '\0'))
+          buf = &data[offset + 1];
+  }
+  GNUNET_free (data);
+
+
+  GNUNET_SERVER_suspend (server_handle);
+  /* Scheduled the task to clean up when shutdown is called */
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+                                NULL);
+}
+
+
+/**
+ * The main function of the regexprofiler 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, "regexprofiler",
+                              GNUNET_SERVICE_OPTION_NONE,
+                              &run, NULL)) ? global_ret : 1;
+}
+
+/* end of gnunet-service-regexprofiler.c */

Added: gnunet/src/mesh/regexprofiler.conf
===================================================================
--- gnunet/src/mesh/regexprofiler.conf                          (rev 0)
+++ gnunet/src/mesh/regexprofiler.conf  2012-11-05 13:29:33 UTC (rev 24731)
@@ -0,0 +1,14 @@
+[regexprofiler]
+AUTOSTART = YES
+# PORT = 0
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+BINARY = gnunet-service-regexprofiler
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-regexprofiler.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+MAX_PATH_COMPRESSION = 4
+POLICY_FILE = /tmp/policies.txt