Gacela as Guile modules.

[gacela.git] / src / gacela_server.scm

diff --git a/src/gacela_server.scm b/src/gacela_server.scm
index 978ea8c56388e5523301f219606045dceb4c3eb5..8c45b20ecdb684f95f3e18fd3e0994ff16329154 100644 (file)
--- a/src/gacela_server.scm
+++ b/src/gacela_server.scm
@@ -21,14 +21,20 @@
 (define eval-from-clients #f)
 (define stop-server #f)
 
-(let ((server-socket #f) (clients '()))
+(let ((server-socket #f) (clients '())
+      (server-pipes #f))
   (set! start-server
-       (lambda (port)
-         (set! server-socket (socket PF_INET SOCK_STREAM 0))
-;        (fcntl server-socket F_SETFL (logior O_NONBLOCK (fcntl server-socket F_GETFL)))
-         (setsockopt server-socket SOL_SOCKET SO_REUSEADDR 1)
-         (bind server-socket AF_INET INADDR_ANY port)
-         (listen server-socket 5)))
+       (lambda* (#:key (port #f) (pipes #f))
+         (cond (port
+                (set! server-socket (socket PF_INET SOCK_STREAM 0))
+                (setsockopt server-socket SOL_SOCKET SO_REUSEADDR 1)
+                (bind server-socket AF_INET INADDR_ANY port)
+                (listen server-socket 5))
+               (pipes
+                (set! server-pipes pipes)))
+         (cond ((not (game-running?))
+                (game-loop)))))
+
 
   (set! clean-closed-connections
        (lambda (conns)
@@ -44,7 +50,6 @@
        (lambda ()
          (set! clients (clean-closed-connections clients))
          (catch #t
-;               (lambda () (set! clients (cons (accept server-socket) clients)))
                 (lambda ()
                   (cond ((char-ready? server-socket)
                          (set! clients (cons (accept server-socket) clients)))))
@@ -52,25 +57,10 @@
 
   (set! eval-from-clients
        (lambda ()
+         (cond (server-pipes
+                (eval-from-client (car server-pipes) (cdr server-pipes))))
          (for-each
-          (lambda (cli)
-            (let ((sock (car cli)))
-              (cond ((char-ready? sock)
-                     (catch #t
-                            (lambda ()
-                              (let ((exp (car (read sock))))
-                                (format #t "~a~%" exp)
-                                (cond ((eof-object? exp)
-                                       (close sock))
-                                      (else
-                                       (format #t "~a~%" (primitive-eval exp))
-                                       (format sock "~a" (primitive-eval exp))))))
-                            (lambda (key . args)
-                              (let ((fmt (string-concatenate (list (cadr args) "~%")))
-                                    (params (caddr args)))
-                                (if params
-                                    (apply format (cons sock (cons fmt params)))
-                                    (format sock fmt)))))))))
+          (lambda (cli) (eval-from-client (car cli) (car cli)))
           clients)))
 
   (set! stop-server
@@ -80,3 +70,27 @@
                 (set! server-socket #f)))
          (for-each (lambda (cli) (close (car cli))) clients)
          (set! clients '()))))
+
+(define (eval-from-client rec-channel send-channel)
+  (cond ((char-ready? rec-channel)
+        (catch #t
+               (lambda ()
+                 (let ((exp (read rec-channel)))
+                   (cond ((eof-object? exp)
+                          (close rec-channel))
+                         (else
+                          (let ((result (eval-string exp)))
+                            (write (if (eq? result *unspecified*) "" (format #f "~a" result)) send-channel))))))
+               (lambda (key . args)
+                 (let ((fmt (string-concatenate (list (cadr args) "~%")))
+                       (params (caddr args)))
+                   (write
+                    (if params
+                        (apply format (cons #f (cons fmt params)))
+                        (format #f fmt))
+                    send-channel))))
+        (force-output send-channel))))
+
+
+(define (connect-to-server client-socket hostname port)
+  (connect client-socket AF_INET (car (hostent:addr-list (gethost hostname))) port))