[GNUnet-SVN] r19178 - in gnunet: . src src/pt

[gnunet]

Author: grothoff
Date: 2012-01-16 20:12:42 +0100 (Mon, 16 Jan 2012)
New Revision: 19178

Added:
   gnunet/src/pt/
   gnunet/src/pt/Makefile.am
   gnunet/src/pt/gnunet-daemon-pt
   gnunet/src/pt/gnunet-daemon-pt.c
   gnunet/src/pt/pt.conf
Modified:
   gnunet/configure.ac
   gnunet/src/Makefile.am
Log:
-skeleton for new PT daemon

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2012-01-16 17:19:42 UTC (rev 19177)
+++ gnunet/configure.ac 2012-01-16 19:12:42 UTC (rev 19178)
@@ -883,6 +883,7 @@
 src/peerinfo/Makefile
 src/peerinfo/peerinfo.conf
 src/peerinfo-tool/Makefile
+src/pt/Makefile
 src/statistics/Makefile
 src/statistics/statistics.conf
 src/template/Makefile

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2012-01-16 17:19:42 UTC (rev 19177)
+++ gnunet/src/Makefile.am      2012-01-16 19:12:42 UTC (rev 19178)
@@ -33,5 +33,6 @@
   dns \
   exit \
   vpn \
+  pt \
   integration-tests \
   $(EXP_DIR) 

Added: gnunet/src/pt/Makefile.am
===================================================================
--- gnunet/src/pt/Makefile.am                           (rev 0)
+++ gnunet/src/pt/Makefile.am   2012-01-16 19:12:42 UTC (rev 19178)
@@ -0,0 +1,29 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+if MINGW
+  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
+endif
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+plugindir = $(libdir)/gnunet
+
+dist_pkgcfg_DATA = \
+  pt.conf
+
+bin_PROGRAMS = \
+  gnunet-daemon-pt $(PTBIN) 
+
+gnunet_daemon_pt_SOURCES = \
+ gnunet-daemon-pt.c 
+gnunet_daemon_pt_LDADD = \
+  $(top_builddir)/src/vpn/libgnunetvpn.la \
+  $(top_builddir)/src/dns/libgnunetdns.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(GN_LIBINTL)

Added: gnunet/src/pt/gnunet-daemon-pt
===================================================================
--- gnunet/src/pt/gnunet-daemon-pt                              (rev 0)
+++ gnunet/src/pt/gnunet-daemon-pt      2012-01-16 19:12:42 UTC (rev 19178)
@@ -0,0 +1,148 @@
+#! /bin/bash
+
+# gnunet-daemon-pt - temporary wrapper script for .libs/gnunet-daemon-pt
+# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2
+#
+# The gnunet-daemon-pt program cannot be directly executed until all the 
libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='/bin/sed -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command="(cd /home/grothoff/svn/gnunet/src/pt; { test -z 
\"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export 
LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH 
|| { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z 
\"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; 
export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset 
LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; 
LD_LIBRARY_PATH=/usr/lib/debug:/home/grothoff/lib; export LD_LIBRARY_PATH; 
PATH=/opt/jdk1.6.0_22/bin:/usr/lib/jvm/java-6-sun//bin:.:/home/grothoff/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games;
 export PATH; gcc -fno-strict-aliasing -Wall -g -Wall -Werror -O0 
-I/home/grothoff//include -o \$progdir/\$file gnunet-daemon-pt.o  
-L/home/grothoff//lib ../../src/vpn/.libs/libgnunetvpn.so 
../../src/dns/.libs/libgnunetdns.so 
../../src/statistics/.libs/libgnunetstatistics.so ../../src/util/.libs/li
 bgnunetutil.so ../../src/mesh/.libs/libgnunetmesh.so -ldl -Wl,-rpath 
-Wl,/home/grothoff/svn/gnunet/src/vpn/.libs -Wl,-rpath 
-Wl,/home/grothoff/svn/gnunet/src/dns/.libs -Wl,-rpath 
-Wl,/home/grothoff/svn/gnunet/src/statistics/.libs -Wl,-rpath 
-Wl,/home/grothoff/svn/gnunet/src/util/.libs -Wl,-rpath 
-Wl,/home/grothoff/svn/gnunet/src/mesh/.libs -Wl,-rpath -Wl,/home/grothoff/lib)"
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.2.6b'
+  notinst_deplibs=' ../../src/vpn/libgnunetvpn.la 
../../src/dns/libgnunetdns.la ../../src/statistics/libgnunetstatistics.la 
../../src/util/libgnunetutil.la ../../src/mesh/libgnunetmesh.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    ECHO="echo"
+    file="$0"
+    # Make sure echo works.
+    if test "X$1" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+      # Yippee, $ECHO works!
+      :
+    else
+      # Restart under the correct shell, and then maybe $ECHO will work.
+      exec /bin/bash "$0" --no-reexec ${1+"$@"}
+    fi
+  fi
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
+  done
+
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "X$thisdir" | $Xsed -e 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program=lt-'gnunet-daemon-pt'
+  progdir="$thisdir/.libs"
+
+  if test ! -f "$progdir/$program" ||
+     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | 
/bin/sed 1q`; \
+       test "X$file" != "X$progdir/$program"; }; then
+
+    file="$$-$program"
+
+    if test ! -d "$progdir"; then
+      mkdir "$progdir"
+    else
+      rm -f "$progdir/$file"
+    fi
+
+    # relink executable if necessary
+    if test -n "$relink_command"; then
+      if relink_command_output=`eval $relink_command 2>&1`; then :
+      else
+       echo "$relink_command_output" >&2
+       rm -f "$progdir/$file"
+       exit 1
+      fi
+    fi
+
+    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
+    { rm -f "$progdir/$program";
+      mv -f "$progdir/$file" "$progdir/$program"; }
+    rm -f "$progdir/$file"
+  fi
+
+  if test -f "$progdir/$program"; then
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    echo "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi


Property changes on: gnunet/src/pt/gnunet-daemon-pt
___________________________________________________________________
Added: svn:executable
   + *

Added: gnunet/src/pt/gnunet-daemon-pt.c
===================================================================
--- gnunet/src/pt/gnunet-daemon-pt.c                            (rev 0)
+++ gnunet/src/pt/gnunet-daemon-pt.c    2012-01-16 19:12:42 UTC (rev 19178)
@@ -0,0 +1,196 @@
+/*
+     This file is part of GNUnet.
+     (C) 2010, 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 pt/gnunet-daemon-pt.c
+ * @brief tool to manipulate DNS and VPN services to perform protocol 
translation (IPvX over GNUnet)
+ * @author Christian Grothoff
+ *
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_dns_service.h"
+#include "gnunet_vpn_service.h"
+#include "gnunet_statistics_service.h"
+
+
+/**
+ * The handle to the configuration used throughout the process
+ */
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
+ * The handle to the VPN
+ */
+static struct GNUNET_VPN_Handle *vpn_handle;
+
+/**
+ * Statistics.
+ */
+static struct GNUNET_STATISTICS_Handle *stats;
+
+/**
+ * The handle to DNS
+ */
+static struct GNUNET_DNS_Handle *dns_handle;
+
+/**
+ * Are we doing IPv4-pt?
+ */
+static int ipv4_pt;
+
+/**
+ * Are we doing IPv6-pt?
+ */
+static int ipv6_pt;
+
+
+
+/**
+ * Signature of a function that is called whenever the DNS service
+ * encounters a DNS request and needs to do something with it.  The
+ * function has then the chance to generate or modify the response by
+ * calling one of the three "GNUNET_DNS_request_*" continuations.
+ *
+ * When a request is intercepted, this function is called first to
+ * give the client a chance to do the complete address resolution;
+ * "rdata" will be NULL for this first call for a DNS request, unless
+ * some other client has already filled in a response.
+ *
+ * If multiple clients exist, all of them are called before the global
+ * DNS.  The global DNS is only called if all of the clients'
+ * functions call GNUNET_DNS_request_forward.  Functions that call
+ * GNUNET_DNS_request_forward will be called again before a final
+ * response is returned to the application.  If any of the clients'
+ * functions call GNUNET_DNS_request_drop, the response is dropped.
+ *
+ * @param cls closure
+ * @param rh request handle to user for reply
+ * @param request_length number of bytes in request
+ * @param request udp payload of the DNS request
+ */
+static void 
+dns_request_handler (void *cls,
+                    struct GNUNET_DNS_RequestHandle *rh,
+                    size_t request_length,
+                    const char *request)
+{
+}
+
+
+/**
+ * Function scheduled as very last function, cleans up after us
+ */
+static void
+cleanup (void *cls GNUNET_UNUSED,
+         const struct GNUNET_SCHEDULER_TaskContext *tskctx)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Pt service is shutting down now\n");
+  if (vpn_handle != NULL)
+  {
+    GNUNET_VPN_disconnect (vpn_handle);
+    vpn_handle = NULL;
+  }
+  if (dns_handle != NULL)
+  {
+    GNUNET_DNS_disconnect (dns_handle);
+    dns_handle = NULL;
+  }
+  if (stats != NULL)
+  {
+    GNUNET_STATISTICS_destroy (stats, GNUNET_YES);
+    stats = NULL;
+  }
+}
+
+
+/**
+ * @brief Main function that will be run by the scheduler.
+ *
+ * @param cls closure
+ * @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, char *const *args GNUNET_UNUSED,
+     const char *cfgfile GNUNET_UNUSED,
+     const struct GNUNET_CONFIGURATION_Handle *cfg_)
+{
+  cfg = cfg_;
+  stats = GNUNET_STATISTICS_create ("pt", cfg);
+  ipv4_pt = GNUNET_CONFIGURATION_get_value_yesno (cfg, "pt", "TUNNEL_IPV4");
+  ipv6_pt = GNUNET_CONFIGURATION_get_value_yesno (cfg, "pt", "TUNNEL_IPV6"); 
+  if (! (ipv4_pt || ipv6_pt))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+               _("No useful service enabled.  Exiting.\n"));
+    GNUNET_SCHEDULER_shutdown ();
+    return;    
+  }
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup, cls);
+  dns_handle 
+    = GNUNET_DNS_connect (cfg, 
+                         GNUNET_DNS_FLAG_POST_RESOLUTION,
+                         &dns_request_handler, NULL);
+  if (NULL == dns_handle)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+               _("Failed to connect to %s service.  Exiting.\n"),
+               "DNS");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  vpn_handle = GNUNET_VPN_connect (cfg);
+  if (NULL == vpn_handle)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+               _("Failed to connect to %s service.  Exiting.\n"),
+               "VPN");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+}
+
+
+/**
+ * The main function
+ *
+ * @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)
+{
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  return (GNUNET_OK ==
+          GNUNET_PROGRAM_run (argc, argv, "gnunet-daemon-pt",
+                              gettext_noop
+                              ("Daemon to run to perform IP protocol 
translation to GNUnet"),
+                              options, &run, NULL)) ? 0 : 1;
+}
+
+
+/* end of gnunet-daemon-pt.c */

Added: gnunet/src/pt/pt.conf
===================================================================
--- gnunet/src/pt/pt.conf                               (rev 0)
+++ gnunet/src/pt/pt.conf       2012-01-16 19:12:42 UTC (rev 19178)
@@ -0,0 +1,10 @@
+[pt]
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-pt
+
+# Set this to YES to tunnel IPv4 traffic over GNUnet
+TUNNEL_IPV4 = NO
+
+# Set this to YES to tunnel IPv6 traffic over GNUnet
+TUNNEL_IPV6 = NO
+