Correcty disconnect from clients which provide the eof-object
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 11 Dec 2016 00:22:12 +0000 (18:22 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 11 Dec 2016 00:22:12 +0000 (18:22 -0600)
mudsync/networking.scm

index 525997546ad024f05298bcacfc19e9b0af19fef0..230008fc76cb5c213e3057f8b6e9e6f2b4c370ae 100644 (file)
 (define (nm-client-receive-loop nm client client-id)
   "Make a method to receive client data"
   (define (loop)
-    (define line (string-trim-right (read-line client) #\return))
-    (nm-handle-line nm client client-id line)
-    (cond
-     ;; The port's been closed for some reason, so stop looping
-     ((port-closed? client)
-      (nm-handle-port-closed nm client client-id))
-     ;; We've reached the EOF object, which means we should close
-     ;; the port ourselves and stop looping
-     ((eof-object? (peek-char client))
-      (nm-handle-port-eof nm client client-id))
-     ;; Otherwise, let's read till the next line!
-     (else (loop))))
+    (define line (read-line client))
+    (if (eof-object? line)
+        (nm-handle-port-eof nm client client-id)
+        (begin
+          (nm-handle-line nm client client-id
+                          (string-trim-right line #\return))
+          (loop))))
   (loop))
 
 (define (nm-handle-port-closed nm client client-id)