4 files changed, 193 insertions, 6 deletions

diff --git a/src/transport/gnunet-service-transport-new b/src/transport/gnunet-service-transport-new
new file mode 100755
index 000000000..b6a531f8f
--- /dev/null
+++ b/src/transport/gnunet-service-transport-new
@@ -0,0 +1,148 @@
+#! /bin/bash
+
+# gnunet-service-transport-new - temporary wrapper script for .libs/gnunet-service-transport-new
+# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#
+# The gnunet-service-transport-new 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/david/Dokumente/gnunet/src/transport; { 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; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=/home/david/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games; export PATH; gcc -fno-strict-aliasing -Wall -Wall -Werror -o \$progdir/\$file gnunet-service-transport-new.o gnunet-service-transport_blacklist.o gnunet-service-transport_clients.o gnunet-service-transport_hello.o gnunet-service-transport_neighbours.o gnunet-service-transport_plugins.o gnunet-service-transport_validation.o  -L/home/david/lib ../../src/ats/.libs/libgnunetats.so ../../src/hello/.libs/libgnunethello.so ../../src/peerinfo/.libs/libgnunetpeerinfo.so ../../src/statistics/.libs/libgnunetstatistics.so ../../src/util/.libs/libgnunetutil.so -ldl -Wl,-rpath -Wl,/home/david/Dokumente/gnunet/src/ats/.libs -Wl,-rpath -Wl,/home/david/Dokumente/gnunet/src/hello/.libs -Wl,-rpath -Wl,/home/david/Dokumente/gnunet/src/peerinfo/.libs -Wl,-rpath -Wl,/home/david/Dokumente/gnunet/src/statistics/.libs -Wl,-rpath -Wl,/home/david/Dokumente/gnunet/src/util/.libs -Wl,-rpath -Wl,/home/david/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/ats/libgnunetats.la ../../src/hello/libgnunethello.la ../../src/peerinfo/libgnunetpeerinfo.la ../../src/statistics/libgnunetstatistics.la ../../src/util/libgnunetutil.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-service-transport-new'
+  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
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index fa638ac0f..dd21d5eff 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -2754,10 +2754,26 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin, int testmode)
                      filenamehw, plugin->interface, testmode);
 #endif
 
-    plugin->server_proc =
-        GNUNET_OS_start_process (plugin->server_stdin, plugin->server_stdout,
-                                 filenamehw, filenamehw, plugin->interface,
-                                 NULL);
+    if (GNUNET_OS_check_helper_binary(filenameloopback) == GNUNET_YES)
+      {
+      plugin->server_proc =
+              GNUNET_OS_start_process (plugin->server_stdin, plugin->server_stdout,
+                                       filenamehw, filenamehw, plugin->interface,
+                                       NULL);
+      }
+    else if (GNUNET_OS_check_helper_binary(filenameloopback) == GNUNET_NO)
+      {
+        GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
+                                 "gnunet-transport-wlan-helper is not suid, please change it or look at the doku\n");
+        GNUNET_break(0);
+      }
+    else
+      {
+        GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
+                                 "gnunet-transport-wlan-helper not found, please look if it exists and is the $PATH variable!\n");
+        GNUNET_break(0);
+      }
+
   }
   else if (testmode == 1)
   {
@@ -2768,9 +2784,18 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin, int testmode)
                      filenameloopback, plugin->interface, testmode);
 #endif
 
-    plugin->server_proc =
+    if (GNUNET_OS_check_helper_binary(filenameloopback) != GNUNET_SYSERR)
+      {
+      plugin->server_proc =
         GNUNET_OS_start_process (plugin->server_stdin, plugin->server_stdout,
                                  filenameloopback, filenameloopback, "1", NULL);
+      }
+    else
+      {
+        GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
+                           "gnunet-transport-wlan-helper-dummy not found, please look if it exists and is the $PATH variable!\n");
+        GNUNET_break(0);
+      }
   }
   else if (testmode == 2)
   {
@@ -2779,9 +2804,18 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin, int testmode)
                      "Starting gnunet-wlan-helper loopback 2 process cmd: %s %s %i\n",
                      filenameloopback, plugin->interface, testmode);
 #endif
-    plugin->server_proc =
+    if (GNUNET_OS_check_helper_binary(filenameloopback) != GNUNET_SYSERR)
+      {
+        plugin->server_proc =
         GNUNET_OS_start_process (plugin->server_stdin, plugin->server_stdout,
                                  filenameloopback, filenameloopback, "2", NULL);
+      }
+    else
+      {
+        GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
+                             "gnunet-transport-wlan-helper-dummy not found, please look if it exists and is in the $PATH variable!\n");
+        GNUNET_break(0);
+      }
   }
   if (plugin->server_proc == NULL)
   {
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index 704fd55b1..50351a63a 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -4,9 +4,11 @@ SERVICEHOME = /tmp/test-transport/api-wlan-p1/
 DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
 
 [transport-wlan]
+INTERFACE = mon0
 TESTMODE = 1
 
 [arm]
+DEBUG = YES
 PORT = 12164
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
@@ -25,6 +27,7 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 [transport]
 PORT = 12160
 PLUGINS = wlan
+DEBUG = YES
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 
 
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index 2ab9811ea..daadec3c8 100644
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ b/src/transport/test_transport_api_wlan_peer2.conf
@@ -9,6 +9,7 @@ TESTMODE = 2
 
 [arm]
 PORT = 12174
+DEBUG = YES
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [statistics]
@@ -26,5 +27,6 @@ UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 [transport]
 PORT = 12170
 PLUGINS = wlan
+DEBUG = YES
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock