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

diff --git a/sockets.lisp b/sockets.lisp
index 2fa8547..2d9a8ff 100644
--- a/sockets.lisp
+++ b/sockets.lisp
@@ -84,7 +84,7 @@ 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 
   (let ((sock (ccl:accept-connection listener :wait t)))
@@ -115,9 +115,9 @@ 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))
 
-#+sbcl
 (defun ipaddr-to-dotted (ipaddr &key values)
   "Convert from 32-bit integer to dotted string."
   (declare (type (unsigned-byte 32) ipaddr))
@@ -129,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)
@@ -176,7 +179,7 @@ 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)))