most network stuff, a copyright notice

diff --git a/mudsync.scm b/mudsync.scm
index 6913ac23f2b5aad572e8bf3b2b4dd07e5c25b258..8c4fb94a3416d4cbf1988fdf385e0cd3581154a5 100644 (file)
--- a/mudsync.scm
+++ b/mudsync.scm
@@ -1,3 +1,21 @@
+;;; Mudsync --- Live hackable MUD
+;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
+;;;
+;;; This file is part of Mudsync.
+;;;
+;;; Mudsync is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; Mudsync is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
+
 (use-modules (8sync systems actors)
              (8sync agenda)
              (ice-9 format)
@@ -10,7 +28,7 @@
 
 (define-class <network-manager> (<actor>)
   (server-socket #:accessor nm-server-socket)
-  ;; mapping of client -> local-id
+  ;; mapping of client -> client-id
   (clients #:accessor nm-clients
            #:init-thunk make-hash-table)
   ;; send input to this actor
@@ -21,7 +39,9 @@
    (make-action-dispatch
     ((start-listening actor message)
      (nm-install-socket actor (message-ref message 'server %default-server)
-                        (message-ref message 'port %default-port))))))
+                        (message-ref message 'port %default-port)))
+    ((send-to-client actor message to-client data)
+     (nm-send-to-client-id actor to-client data)))))
 
 (define-method (nm-close-everything (nm <network-manager>) remove-from-agenda)
   "Shut it down!"
@@ -92,11 +112,11 @@
             (gethostbyaddr
              (sockaddr:addr client-details)))
 
-    (let ((local-id (big-random-number)))
-      (hash-set! (nm-clients nm) local-id client)
-      (8sync-port client #:read (nm-make-client-receive nm local-id)))))
+    (let ((client-id (big-random-number)))
+      (hash-set! (nm-clients nm) client-id client)
+      (8sync-port client #:read (nm-make-client-receive nm client-id)))))
 
-(define-method (nm-make-client-receive (nm <network-manager>) local-id)
+(define-method (nm-make-client-receive (nm <network-manager>) client-id)
   "Make a method to receive client data"
   (let ((buffer '()))
     (define (reset-buffer)
@@ -115,33 +135,39 @@
              ;; reset buffer
              (set! buffer '())
              ;; run it
-             (nm-handle-line nm client local-id ready-line)))
+             (nm-handle-line nm client client-id ready-line)))
           (_ #f)))
       ;; Shut things down on closed port or EOF object
       (cond
        ((port-closed? client)
-        (nm-handle-port-closed nm client local-id))
+        (nm-handle-port-closed nm client client-id))
        ((and (char-ready? client)
              (eof-object? (peek-char client)))
-        (nm-handle-port-eof nm client local-id))))
+        (nm-handle-port-eof nm client client-id))))
     receive-handler))
 
-(define-method (nm-handle-port-closed (nm <network-manager>) client local-id)
+(define-method (nm-handle-port-closed (nm <network-manager>) client client-id)
   "Handle a closed port"
-  (format #t "DEBUG: handled closed port ~x\n" local-id)
+  (format #t "DEBUG: handled closed port ~x\n" client-id)
   (8sync-port-remove client)
-  (hash-remove! (nm-clients nm) local-id))
+  (hash-remove! (nm-clients nm) client-id))
 
-(define-method (nm-handle-port-eof (nm <network-manager>) client local-id)
+(define-method (nm-handle-port-eof (nm <network-manager>) client client-id)
   "Handle seeing an EOF on port"
-  (format #t "DEBUG: handled eof-object on port ~x\n" local-id)
+  (format #t "DEBUG: handled eof-object on port ~x\n" client-id)
   (close client)
   (8sync-port-remove client)
-  (hash-remove! (nm-clients nm) local-id))
+  (hash-remove! (nm-clients nm) client-id))
 
-(define-method (nm-handle-line (nm <network-manager>) client local-id line)
+(define-method (nm-handle-line (nm <network-manager>) client client-id line)
   "Handle an incoming line of input from a client"
-  (format #t "~x got line: ~s\n" local-id line))
+  (format #t "~x got line: ~s\n" client-id line)
+  (nm-send-to-client-id nm client-id "Thank, you, processed.\n" ))
+
+(define-method (nm-send-to-client-id (nm <network-manager>) client-id data)
+  "Send DATA to TO-CLIENT id"
+  (display data
+           (hash-ref (nm-clients nm) client-id)))
 
 ; (ez-run-hive hive (list (bootstrap-message hive (actor-id nm) 'start-listening)))