X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=mudsync%2Fnetworking.scm;h=d2593d11e2f92784b9b73803504a325bc248b499;hp=f12a7e0c86578927bcfa53d18eef1afb6a532ffb;hb=754bd427883ab189433fad90293e05d9aced2f70;hpb=d23f2cefbde148dedc61da5cf35391a12c6734bb diff --git a/mudsync/networking.scm b/mudsync/networking.scm index f12a7e0..d2593d1 100644 --- a/mudsync/networking.scm +++ b/mudsync/networking.scm @@ -135,7 +135,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) + (<-* `(#:actor ,nm) (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) @@ -147,7 +147,7 @@ (begin (nm-handle-line nm client client-id (string-trim-right line #\return)) - (when (actor-am-i-alive? nm) + (when (actor-alive? nm) (loop))))) (loop)) @@ -155,18 +155,19 @@ "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))