1 files changed, 18 insertions, 17 deletions

diff --git a/src/org/gnunet/util/Server.java b/src/org/gnunet/util/Server.java
index d6a4290..8aa7c60 100644
--- a/src/org/gnunet/util/Server.java
+++ b/src/org/gnunet/util/Server.java
@@ -30,17 +30,17 @@ import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 
 public class Server {
-
-
     private final RelativeTime idleTimeout;
     private final boolean requireFound;
     private List<ServerSocketChannel> listenSockets;
     private List<ClientHandle> clients;
 
     private HashMap<Class, MessageRunabout> handlers;
+    private List<DisconnectHandler> disconnectHandlers = new LinkedList<DisconnectHandler>();
 
 
     public class ClientHandle {
@@ -62,9 +62,9 @@ public class Server {
          * Notify us when the server has enough space to transmit
          * a message of the given size to the given client.
          *
-         * @param size         requested amount of buffer space
-         * @param timeout      after how long should we give up (and call
-         *                     notify with buf NULL and size 0)?
+         * @param size        requested amount of buffer space
+         * @param timeout     after how long should we give up (and call
+         *                    notify with buf NULL and size 0)?
          * @param transmitter callback
          * @return a handle to cancel the notification
          */
@@ -76,7 +76,7 @@ public class Server {
          * Resume receiving from this client, we are done processing the
          * current request.  This function must be called from within each
          * message handler (or its respective continuations).
-         *
+         * <p/>
          * The server does not automatically continue to receive messages to
          * support flow control.
          *
@@ -144,9 +144,8 @@ public class Server {
      * @param srv ...
      */
     private void doAccept(final ServerSocketChannel srv) {
-        /*
-        Scheduler.TaskBuilder b = new Scheduler.TaskBuilder();
-        b.withTask(new Scheduler.Task() {
+        Scheduler.TaskConfiguration b = new Scheduler.TaskConfiguration(RelativeTime.FOREVER,
+        new Scheduler.Task() {
             @Override
             public void run(Scheduler.RunContext ctx) {
                 try {
@@ -159,9 +158,8 @@ public class Server {
                 doAccept(srv);
             }
         });
-        b.withSelectAccept(srv);
-        Scheduler.add(b);
-        */
+        b.selectAccept(srv);
+        b.schedule();
     }
 
 
@@ -214,13 +212,16 @@ public class Server {
         void onDisconnect(ClientHandle clientHandle);
     }
 
-    public Cancelable notifyDisconnect(DisconnectHandler disconnectHandler) {
-        return null;
+    public Cancelable notifyDisconnect(final DisconnectHandler disconnectHandler) {
+        this.disconnectHandlers.add(disconnectHandler);
+        return new Cancelable() {
+            @Override
+            public void cancel() {
+                Server.this.disconnectHandlers.remove(disconnectHandler);
+            }
+        };
     }
 
-    /**
-     * Free resources held by this server.
-     */
     public void destroy() {
 
     }