1 files changed, 10 insertions, 30 deletions

diff --git a/gnu/gnunet/dht/client.scm b/gnu/gnunet/dht/client.scm
index bd0feb4..d4c32eb 100644
--- a/gnu/gnunet/dht/client.scm
+++ b/gnu/gnunet/dht/client.scm
@@ -77,17 +77,14 @@
           (gnu gnunet hashcode struct)
           (gnu gnunet mq)
           (gnu gnunet mq handler)
-          (gnu gnunet mq-impl stream)
           (gnu gnunet mq envelope)
           (only (gnu gnunet server)
                 maybe-send-control-message! maybe-send-control-message!*
                 maybe-ask* answer
                 <server> server-terminal-condition server-control-channel
                 make-disconnect! handle-control-message!
-                make-loop loop:control-channel loop:connected
-                loop:disconnected loop:configuration loop:service-name
-                loop:spawner loop:terminal-condition loop:lost-and-found
-                loop:control-channel run-loop server->loop-arguments)
+                loop:terminal-condition loop:control-channel
+                run-loop spawn-server-loop)
           (only (guile)
                 pk define-syntax-rule define* lambda* error
                 ->bool and=>)
@@ -102,16 +99,7 @@
                 bbtree-delete make-bbtree bbtree-ref)
           (only (gnu extractor enum)
                 symbol-value)
-          (only (fibers)
-                spawn-fiber)
-          (only (fibers conditions)
-                make-condition signal-condition! wait-operation wait)
-          (only (fibers operations)
-                perform-operation choice-operation wrap-operation)
-          (only (fibers channels)
-                put-operation get-operation put-message)
           (only (gnu gnunet concurrency lost-and-found)
-                make-lost-and-found collect-lost-and-found-operation
                 losable-lost-and-found)
           (gnu gnunet dht struct)
           (only (gnu gnunet message protocols)
@@ -130,7 +118,7 @@
                 quote case else values apply let cond if > eq?
                 <= expt assert exact? integer? lambda for-each
                 not expt min max div-and-mod positive? define-syntax
-                vector cons)
+                vector cons append list)
           (only (rnrs control)
                 unless when)
           (only (rnrs records syntactic)
@@ -744,27 +732,19 @@ message header is assumed to be correct."
       (make-disconnect! 'distributed-hash-table ; for error messages
                         server:dht?))
 
-    (define* (connect config #:key (connected values) (disconnected values)
-                      (spawn spawn-fiber))
+    (define* (connect config #:key connected disconnected spawn #:rest r)
       "Connect to the DHT service, using the configuration @var{config}.  The
 connection is made asynchronuously; the optional thunk @var{connected} is called
 when the connection has been made.  The connection can break; the optional thunk
 @var{disconnected} is called when it does. If the connection breaks, the client
 code automatically tries to reconnect, so @var{connected} can be called after
 @var{disconnected}.  This procedure returns a DHT server object."
-      (define server (make-server))
-      (define loop
-        (apply make-loop
-               #:make-message-handlers make-message-handlers
-               #:control-message-handler control-message-handler
-               #:configuration config
-               #:service-name "dht"
-               #:spawn spawn
-               #:connected connected
-               #:disconnected disconnected #:spawn spawn
-               (server->loop-arguments server)))
-      (spawn (lambda () (run-loop loop empty-bbtree empty-bbtree)))
-      server)
+      (apply spawn-server-loop (make-server)
+             #:make-message-handlers make-message-handlers
+             #:control-message-handler control-message-handler
+             #:configuration config
+             #:service-name "dht"
+             #:initial-extra-loop-arguments (list empty-bbtree empty-bbtree) r))
 
     ;; TODO: put in new module?
     (define (make-weak-reference to)