1 files changed, 30 insertions, 5 deletions

diff --git a/src/main/java/org/gnunet/util/Helper.java b/src/main/java/org/gnunet/util/Helper.java
index e8c1723..46451b0 100644
--- a/src/main/java/org/gnunet/util/Helper.java
+++ b/src/main/java/org/gnunet/util/Helper.java
@@ -6,7 +6,10 @@ import org.gnunet.construct.MessageLoader;
 import org.gnunet.construct.ProtocolViolationException;
 import org.gnunet.mq.Envelope;
 import org.gnunet.mq.MessageQueue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.io.IOError;
 import java.io.IOException;
 import java.nio.Buffer;
@@ -18,17 +21,20 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * Process that we can communicate with standard GNUnet messages over stdin/stdout.
+ * Process that we can communicate to with standard GNUnet messages over stdin/stdout.
  */
 public class Helper extends MessageQueue {
+    private static final Logger logger = LoggerFactory
+            .getLogger(Helper.class);
 
     private final ProcessBuilder processBuilder;
     private final RunaboutMessageReceiver receiver;
     private Process process;
-
     private volatile GnunetMessage.Body writeMessage;
+    private WriteThread writeThread;
+    private ReadThread readThread;
 
-    private final class WriteThread implements Runnable {
+    private final class WriteThread extends Thread {
         @Override
         public void run() {
             GnunetMessage.Body msg;
@@ -62,7 +68,7 @@ public class Helper extends MessageQueue {
         }
     }
 
-    private final class ReadThread implements Runnable {
+    private final class ReadThread extends Thread {
         private ByteBuffer buffer;
         ReadableByteChannel channel;
 
@@ -133,6 +139,15 @@ public class Helper extends MessageQueue {
         }
     }
 
+    private String getBinaryPath(String binaryName) {
+        if (!binaryName.contains("gnunet"))
+            return binaryName;
+        String prefix = System.getenv("GNUNET_PREFIX");
+        if (prefix == null || prefix.isEmpty())
+            return binaryName;
+        // FIXME: this is not portable at all
+        return prefix + "/lib/" + "gnunet/" + "libexec/" +  binaryName;
+    }
 
     public Helper(boolean withControlPipe, String binaryName, List<String> argv,
                   RunaboutMessageReceiver receiver) {
@@ -141,7 +156,7 @@ public class Helper extends MessageQueue {
         if (binaryName == null) {
             throw new AssertionError();
         }
-        command.add(binaryName);
+        command.add(getBinaryPath(binaryName));
         if (argv != null)
             command.addAll(argv);
         processBuilder = new ProcessBuilder(command);
@@ -150,6 +165,14 @@ public class Helper extends MessageQueue {
         } catch (IOException e) {
             throw new IOError(e);
         }
+
+        writeThread = new WriteThread();
+        readThread = new ReadThread();
+
+        writeThread.start();
+        readThread.start();
+
+        reportReadyForSubmit();
     }
 
     /**
@@ -191,12 +214,14 @@ public class Helper extends MessageQueue {
 
     @Override
     protected void submit(Envelope ev) {
+        logger.debug("submitting envelope to helper thread");
         synchronized (this) {
             if (writeMessage != null)
                 throw new AssertionError("message queue not implemented correctly");
             writeMessage = ev.message;
             notifyAll();
         }
+        reportReadyForSubmit();
     }
 
     @Override