1 files changed, 68 insertions, 29 deletions

diff --git a/src/org/gnunet/util/Service.java b/src/org/gnunet/util/Service.java
index bbbba00..69742b6 100644
--- a/src/org/gnunet/util/Service.java
+++ b/src/org/gnunet/util/Service.java
@@ -29,14 +29,21 @@ import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.nio.ByteBuffer;
 import java.nio.channels.Channel;
 import java.nio.channels.FileChannel;
+import java.nio.channels.Pipe;
 import java.nio.channels.SelectableChannel;
 import java.util.LinkedList;
 
 /**
  * Server the entry point class for every gnunet-java component providing services
  * to other components.
+ *
+ * The configuration for the server (i.e. ports/interfaces) is loaded with the standard configuration system.
+ *
+ * Note that other processes can send signals to the service via a pipe, whose name has to be given in the
+ * environment variable GNUNET_OS_CONTROL_PIPE
  */
 public abstract class Service extends Program {
     private static final Logger logger = LoggerFactory
@@ -47,8 +54,9 @@ public abstract class Service extends Program {
     private RelativeTime idleTimeout;
     private boolean requireFound;
 
+
     private Cancelable sigpipeTask;
-    private SelectableChannel sigpipeChannel;
+    private Pipe.SourceChannel sigpipeChannel;
 
     public Service(String serviceName, RelativeTime idleTimeout, boolean requireFound, String[] args) {
         super(args);
@@ -57,63 +65,94 @@ public abstract class Service extends Program {
         this.requireFound = requireFound;
     }
 
-    
+    /**
+     * Obtain the server used by a service.  Note that the server must NOT
+     * be destroyed by the caller.
+     *
+     * @return handle to the server for this service, NULL if there is none
+     */
     public final Server getServer() {
         return s;
     }
 
+    /**
+     * Stop the service.
+     */
     public void stop() {
-
+        s.stopListening();
     }
 
-    public void start() {
-        super.start();
+    public void runHook() {
         String ip4AddrList = getConfiguration().getValueString(serviceName, "ACCEPT_FROM");
         String ip6AddrList = getConfiguration().getValueString(serviceName, "ACCEPT_FROM6");
         int port = (int) getConfiguration().getValueNumer(serviceName, "PORT");
 
         LinkedList<SocketAddress> addrs = new LinkedList<SocketAddress>();
 
-        for (String ip4Addr : ip4AddrList.split("[;]")) {
-            InetAddress addr = Resolver.getInetAddressFromString(ip4Addr);
-            addrs.add(new InetSocketAddress(addr, port));
+        if (ip4AddrList != null) {
+            for (String ip4Addr : ip4AddrList.split("[;]")) {
+                InetAddress addr = Resolver.getInetAddressFromString(ip4Addr);
+                addrs.add(new InetSocketAddress(addr, port));
+            }
         }
 
-        for (String ip6Addr : ip6AddrList.split("[;]")) {
-            InetAddress addr = Resolver.getInetAddressFromString(ip6Addr);
-            addrs.add(new InetSocketAddress(addr, port));
+        if (ip6AddrList != null) {
+            for (String ip6Addr : ip6AddrList.split("[;]")) {
+                InetAddress addr = Resolver.getInetAddressFromString(ip6Addr);
+                addrs.add(new InetSocketAddress(addr, port));
+            }
         }
 
         s = new Server(addrs, idleTimeout, requireFound);
 
         String pipeName = System.getenv("GNUNET_OS_CONTROL_PIPE");
-        if (pipeName != null) {
-            logger.debug("service started with control pipe");
-            FileChannel f;
-            try {
-                f = (new FileInputStream(pipeName)).getChannel();
-            } catch (FileNotFoundException e) {
-                logger.error("could not open control pipe");
-            }
+        if (pipeName != null && !pipeName.isEmpty()) {
+            Scheduler.FilePipe p = Scheduler.openFilePipe(new File(pipeName));
 
             Scheduler.TaskConfiguration t = new Scheduler.TaskConfiguration(RelativeTime.FOREVER,
                     new SigpipeTask());
+            t.selectRead(p.getSource());
             sigpipeTask = t.schedule();
+            sigpipeChannel = p.getSource();
         }
-    }
 
-    public class SigpipeTask implements Scheduler.Task {
+        run();
+    }
 
+    private class SigpipeTask implements Scheduler.Task {
         @Override
         public void run(Scheduler.RunContext ctx) {
-            Scheduler.TaskConfiguration t = new Scheduler.TaskConfiguration(RelativeTime.FOREVER,
-                    new SigpipeTask());
-            sigpipeTask = t.schedule();
+            ByteBuffer b = ByteBuffer.allocate(1);
+            int n;
+            try {
+                n = sigpipeChannel.read(b);
+            } catch (IOException e) {
+                logger.error("error reading signal pipe", e);
+                return;
+            }
+            b.flip();
+            boolean stopped = false;
+
+            if (n == 1) {
+                byte sig = b.get();
+                // 15=sigterm
+                if (sig == 15) {
+                    logger.info("service shutting down");
+                    getServer().stopListening();
+                    stopped = true;
+                }
+            }
+            if (!stopped) {
+                Scheduler.TaskConfiguration t = new Scheduler.TaskConfiguration(RelativeTime.FOREVER, this);
+                sigpipeTask = t.schedule();
+            } else {
+                try {
+                    sigpipeChannel.close();
+                } catch (IOException e) {
+                    logger.error("could not close sigpipe channel, quitting");
+                    System.exit(2);
+                }
+            }
         }
     }
-
-    /**
-     * Override to implement the behavior of the Program.
-     */
-    public abstract void run();
 }
\ No newline at end of file