X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela_server.scm;h=8c45b20ecdb684f95f3e18fd3e0994ff16329154;hb=ca3edcecf937f854c1b5d9eeac566d85dc749cd0;hp=f58c8b6399666098fd586d370e4d9b9f4158aa7a;hpb=c4dbd17a165312f189ec5211069dab4d039d5471;p=gacela.git

diff --git a/src/gacela_server.scm b/src/gacela_server.scm
index f58c8b6..8c45b20 100644
--- a/src/gacela_server.scm
+++ b/src/gacela_server.scm
@@ -17,22 +17,39 @@
 
 (define start-server #f)
 (define check-connections #f)
+(define clean-closed-connections #f)
 (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)
+	  (cond ((null? conns) '())
+		(else
+		 (let* ((cli (car conns)) (sock (car cli)))
+		   (cond ((port-closed? sock)
+			  (clean-closed-connections (cdr conns)))
+			 (else
+			  (cons cli (clean-closed-connections (cdr conns))))))))))
 
   (set! check-connections
 	(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)))))
@@ -40,13 +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 () (display (primitive-eval (read sock)) sock))
-			     (lambda (key . args) #f))))))
+	   (lambda (cli) (eval-from-client (car cli) (car cli)))
 	   clients)))
 
   (set! stop-server
@@ -56,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))