X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fnetworking.scm;h=f30a1b99825199c913df3beb9424148a59f74ed2;hp=bb403f8f998fe1755076515114ba74f94590d870;hb=b1bf0fc9ec0ffcc06b7b1d4e422f3e28a00a27a6;hpb=6cff5b0062ef928204295ab4327bf2d417070421

diff --git a/mudsync/networking.scm b/mudsync/networking.scm
index bb403f8..f30a1b9 100644
--- a/mudsync/networking.scm
+++ b/mudsync/networking.scm
@@ -17,7 +17,7 @@
 ;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (mudsync networking)
-  #:use-module (8sync systems actors)
+  #:use-module (8sync actors)
   #:use-module (8sync agenda)
   #:use-module (ice-9 format)
   #:use-module (ice-9 match)
@@ -37,25 +37,24 @@
 (define %default-server #f)
 (define %default-port 8889)
 
-(define-class <network-manager> (<actor>)
+(define-actor <network-manager> (<actor>)
+  ((start-listening
+    (lambda* (actor message
+                    #:key (server %default-server)
+                    (port %default-port))
+      (nm-install-socket actor server port)))
+   (send-to-client
+    (lambda* (actor message #:key client data)
+      (nm-send-to-client-id actor client data)))
+   (new-client nm-new-client))
+
   (server-socket #:getter nm-server-socket)
   ;; mapping of client -> client-id
   (clients #:getter nm-clients
            #:init-thunk make-hash-table)
   ;; send input to this actor
   (send-input-to #:getter nm-send-input-to
-                 #:init-keyword #:send-input-to)
-  (message-handler
-   #:init-value
-   (make-action-dispatch
-    (start-listening
-     (lambda* (actor message
-                     #:key (server %default-server)
-                     (port %default-port))
-       (nm-install-socket actor server port)))
-    (send-to-client
-     (lambda* (actor message #:key client data)
-       (nm-send-to-client-id actor client data))))))
+                 #:init-keyword #:send-input-to))
 
 ;;; TODO: We should provide something like this, but this isn't used currently,
 ;;;    and uses old deprecated code (the 8sync-port-remove stuff).
@@ -119,10 +118,11 @@
   (let loop ()
     ;; (yield)  ;; @@: Do we need this?
     (define client-connection (accept s))
-    (8sync (nm-new-client nm s client-connection))
+    (<- (actor-id nm) 'new-client
+        s client-connection)
     (loop)))
 
-(define (nm-new-client nm s client-connection)
+(define (nm-new-client nm message s client-connection)
   "Handle new client coming in to socket S"
   (define client-details (cdr client-connection))
   (define client (car client-connection))
@@ -133,7 +133,7 @@
            (sockaddr:addr client-details)))
   (fcntl client F_SETFL (logior O_NONBLOCK (fcntl client F_GETFL)))
   (hash-set! (nm-clients nm) client-id client)
-  (<- nm (nm-send-input-to nm) 'new-client #:client client-id)
+  (<- (nm-send-input-to nm) 'new-client #:client client-id)
   (nm-client-receive-loop nm client client-id))
 
 (define (nm-client-receive-loop nm client client-id)
@@ -145,25 +145,27 @@
         (begin
           (nm-handle-line nm client client-id
                           (string-trim-right line #\return))
-          (loop))))
+          (when (actor-alive? nm)
+            (loop)))))
   (loop))
 
 (define (nm-handle-port-closed nm client client-id)
   "Handle a closed port"
   (format #t "DEBUG: handled closed port ~x\n" client-id)
   (hash-remove! (nm-clients nm) client-id)
-  (<- nm (nm-send-input-to nm) 'client-closed #:client client-id))
+  (<-* `(#:actor ,nm) (nm-send-input-to nm) 'client-closed #:client client-id))
 
 (define-method (nm-handle-port-eof nm client client-id)
   "Handle seeing an EOF on port"
   (format #t "DEBUG: handled eof-object on port ~x\n" client-id)
       (close client)
   (hash-remove! (nm-clients nm) client-id)
-  (<- nm (nm-send-input-to nm) 'client-closed #:client client-id))
+  (<-* `(#:actor ,nm) (nm-send-input-to nm) 'client-closed
+       #:client client-id))
 
 (define-method (nm-handle-line nm client client-id line)
   "Handle an incoming line of input from a client"
-  (<- nm (nm-send-input-to nm) 'client-input
+  (<-* `(#:actor ,nm) (nm-send-input-to nm) 'client-input
       #:data line
       #:client client-id))