X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=sockets.lisp;h=41c751ccd496ad8934baa72ad3aa8721328af558;hp=f105501777be5e122c3cdf012c5c44ff6ca0b1e9;hb=4b512145081c369cb1dbfe579a4dfd5a32476b92;hpb=ea921dd2ce51a46bb3ca92a07df095d5ace99dcf

diff --git a/sockets.lisp b/sockets.lisp
index f105501..41c751c 100644
--- a/sockets.lisp
+++ b/sockets.lisp
@@ -27,26 +27,30 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
 			       :protocol :tcp)))
     (if reuse
         (setf (sb-bsd-sockets:sockopt-reuse-address socket) t))
-    (sb-bsd-sockets:socket-bind 
+    (sb-bsd-sockets:socket-bind
      socket (sb-bsd-sockets:make-inet-address "0.0.0.0") port)
     (sb-bsd-sockets:socket-listen socket 15)
     socket))
 
 (defun create-inet-listener (port &key (format :text) (reuse-address t))
+  #+cmu (declare (ignore format reuse-address))
   #+cmu (ext:create-inet-listener port)
   #+allegro
   (socket:make-socket :connect :passive :local-port port :format format
-		      :address-family 
+		      :address-family
 		      (if (stringp port)
 			  :file
 			(if (or (null port) (integerp port))
 			    :internet
 			  (error "illegal value for port: ~s" port)))
 		      :reuse-address reuse-address)
-  #+sbcl
-  (listen-to-inet-port :port port :reuse reuse-address)
+  #+sbcl (declare (ignore format))
+  #+sbcl (listen-to-inet-port :port port :reuse reuse-address)
+  #+clisp (declare (ignore format reuse-address))
   #+clisp (ext:socket-server port)
-  #+openmcl 
+  #+openmcl
+  (declare (ignore format))
+  #+openmcl
   (ccl:make-socket :connect :passive :local-port port
 		   :reuse-address reuse-address)
   #-(or allegro clisp cmu sbcl openmcl)
@@ -84,9 +88,9 @@ 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)))
-  #+openmcl 
+  #+openmcl
   (let ((sock (ccl:accept-connection listener :wait t)))
     (values sock sock))
   #-(or allegro clisp cmu sbcl openmcl)
@@ -104,7 +108,7 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
 
 (defun close-passive-socket (socket)
   #+allegro (close socket)
-  #+clisp (close socket)
+  #+clisp (ext:socket-server-close socket)
   #+cmu (unix:unix-close socket)
   #+sbcl (sb-unix:unix-close
 	  (sb-bsd-sockets:socket-file-descriptor socket))
@@ -115,7 +119,8 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
 
 
 (defun close-active-socket (socket)
-  (close socket))
+  #+sbcl (sb-bsd-sockets:socket-close socket)
+  #-sbcl (close socket))
 
 (defun ipaddr-to-dotted (ipaddr &key values)
   "Convert from 32-bit integer to dotted string."
@@ -133,12 +138,16 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
   (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)
@@ -174,13 +183,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 server port)))
     (values
      (sys:make-fd-stream sock :input t :output t :element-type 'base-char)
      sock))
+  #+clisp
+  (let ((sock (ext:socket-connect port server)))
+    (values sock sock))
   #+openmcl
   (let ((sock (ccl:make-socket :remote-host server :remote-port port )))
     (values sock sock))
@@ -189,15 +201,19 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
 (defun ipaddr-array-to-dotted (array)
   (format nil "~{~D~^.~}" (coerce array 'list))
   #+ignore
-  (format nil "~D.~D.~D.~D" 
+  (format nil "~D.~D.~D.~D"
 	  (aref 0 array) (aref 1 array) (aref 2 array) (array 3 array)))
 
 (defun remote-host (socket)
   #+allegro (socket:ipaddr-to-dotted (socket:remote-host socket))
   #+lispworks (nth-value 0 (comm:get-socket-peer-address socket))
-  #+sbcl (ipaddr-array-to-dotted 
+  #+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))
+  #+clisp (let* ((peer (ext:socket-stream-peer socket t))
+                (stop (position #\Space peer)))
+           ;; 2.37-2.39 had do-not-resolve-p backwards
+           (if stop (subseq peer 0 stop) peer))
   #+openmcl (ccl:remote-host socket)
   )
-  
+