X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=sockets.lisp;h=2d9a8ff0765072e03b5c43d5916f87a90fd7b110;hp=0ab5d941ffaf385c1bf792a7bcf62b81439beca0;hb=c806ada1a12795e377d2ad588e56e051c7a92598;hpb=cf4d25858f4969025835e23008818d94c6e23208

diff --git a/sockets.lisp b/sockets.lisp
index 0ab5d94..2d9a8ff 100644
--- a/sockets.lisp
+++ b/sockets.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg with excerpts from portableaserve
 ;;;; Date Started:  Jun 2003
 ;;;;
-;;;; $Id: sockets.lisp,v 1.6 2003/07/21 08:41:19 kevin Exp $
+;;;; $Id$
 ;;;; *************************************************************************
 
 (in-package #:kmrcl)
@@ -46,7 +46,10 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
   #+sbcl
   (listen-to-inet-port :port port :reuse reuse-address)
   #+clisp (ext:socket-server port)
-  #-(or allegro clisp cmu sbcl)
+  #+openmcl 
+  (ccl:make-socket :connect :passive :local-port port
+		   :reuse-address reuse-address)
+  #-(or allegro clisp cmu sbcl openmcl)
   (warn "create-inet-listener not supported on this implementation")
   )
 
@@ -69,7 +72,7 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
     (values sock sock))
   #+clisp
   (let ((sock (ext:socket-accept listener)))
-    (value sock sock))
+    (values sock sock))
   #+cmu
   (progn
     (mp:process-wait-until-fd-usable listener :input)
@@ -81,9 +84,12 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
     (let ((sock (sb-bsd-sockets:socket-accept listener)))
       (values
        (sb-bsd-sockets:socket-make-stream
-	sock :element-type 'base-char :input t :output t)
+	sock :element-type :default :input t :output t)
        sock)))
-  #-(or allegro clisp cmu sbcl)
+  #+openmcl 
+  (let ((sock (ccl:accept-connection listener :wait t)))
+    (values sock sock))
+  #-(or allegro clisp cmu sbcl openmcl)
   (warn "accept-tcp-connection not supported on this implementation")
   )
 
@@ -102,15 +108,16 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
   #+cmu (unix:unix-close socket)
   #+sbcl (sb-unix:unix-close
 	  (sb-bsd-sockets:socket-file-descriptor socket))
-  #-(or allegro clisp cmu sbcl)
+  #+openmcl (close socket)
+  #-(or allegro clisp cmu sbcl openmcl)
   (warn "close-passive-socket not supported on this implementation")
   )
 
 
 (defun close-active-socket (socket)
-  (close socket))
+  #+sbcl (sb-bsd-sockets:socket-close socket)
+  #-sbcl (close socket))
 
-#+sbcl
 (defun ipaddr-to-dotted (ipaddr &key values)
   "Convert from 32-bit integer to dotted string."
   (declare (type (unsigned-byte 32) ipaddr))
@@ -122,18 +129,21 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
 	(values a b c d)
       (format nil "~d.~d.~d.~d" a b c d))))
 
-#+sbcl
 (defun dotted-to-ipaddr (dotted &key (errorp t))
   "Convert from dotted string to 32-bit integer."
   (declare (string dotted))
   (if errorp
       (let ((ll (delimited-string-to-list dotted #\.)))
-	(+ (ash (first ll) 24) (ash (second ll) 16)
-	   (ash (third ll) 8) (fourth ll)))
+	(+ (ash (parse-integer (first ll)) 24) 
+	   (ash (parse-integer (second ll)) 16)
+	   (ash (parse-integer (third ll)) 8) 
+	   (parse-integer (fourth ll))))
     (ignore-errors
       (let ((ll (delimited-string-to-list dotted #\.)))
-	(+ (ash (first ll) 24) (ash (second ll) 16)
-	   (ash (third ll) 8) (fourth ll))))))
+	(+ (ash (parse-integer (first ll)) 24)
+	   (ash (parse-integer (second ll)) 16)
+	   (ash (parse-integer (third ll)) 8) 
+	   (parse-integer (fourth ll)))))))
 
 #+sbcl
 (defun ipaddr-to-hostname (ipaddr &key ignore-cache)
@@ -169,13 +179,16 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
     (sb-bsd-sockets:socket-connect sock (lookup-hostname server) port)
     (values
      (sb-bsd-sockets:socket-make-stream
-      sock :input t :output t :element-type 'base-char)
+      sock :input t :output t :element-type :default)
      sock))
   #+cmu
-  (let ((sock (ext:connect-to-inet-socket host port)))
+  (let ((sock (ext:connect-to-inet-socket server port)))
     (values
      (sys:make-fd-stream sock :input t :output t :element-type 'base-char)
      sock))
+  #+openmcl
+  (let ((sock (ccl:make-socket :remote-host server :remote-port port )))
+    (values sock sock))
   )
 
 (defun ipaddr-array-to-dotted (array)
@@ -190,5 +203,6 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
   #+sbcl (ipaddr-array-to-dotted 
 	  (nth-value 0 (sb-bsd-sockets:socket-peername socket)))
   #+cmu (nth-value 0 (ext:get-peer-host-and-port socket))
+  #+openmcl (ccl:remote-host socket)
   )