r9078: add ppmx

[kmrcl.git] / sockets.lisp

diff --git a/sockets.lisp b/sockets.lisp
index 259b7b0fc448fdb69b78f3fb9ad41e60bc62c2e6..74fa27e1a82d9d8acf6a5adc8535eea213648d3a 100644 (file)
--- 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.4 2003/07/11 06:58:32 kevin Exp $
+;;;; $Id$
 ;;;; *************************************************************************
 
 (in-package #:kmrcl)
@@ -35,7 +35,7 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
 (defun create-inet-listener (port &key (format :text) (reuse-address t))
   #+cmu (ext:create-inet-listener port)
   #+allegro
-  (socket:make-socket :connect :passive :local-port port :format :binary
+  (socket:make-socket :connect :passive :local-port port :format format
                      :address-family 
                      (if (stringp port)
                          :file
@@ -69,7 +69,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)
@@ -127,13 +127,13 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
   "Convert from dotted string to 32-bit integer."
   (declare (string dotted))
   (if errorp
-      (let ((ll (string-tokens (substitute #\Space #\. dotted))))
+      (let ((ll (delimited-string-to-list dotted #\.)))
        (+ (ash (first ll) 24) (ash (second ll) 16)
           (ash (third ll) 8) (fourth ll)))
     (ignore-errors
-       (let ((ll (string-tokens (substitute #\Space #\. dotted))))
-         (+ (ash (first ll) 24) (ash (second ll) 16)
-            (ash (third ll) 8) (fourth ll))))))
+      (let ((ll (delimited-string-to-list dotted #\.)))
+       (+ (ash (first ll) 24) (ash (second ll) 16)
+          (ash (third ll) 8) (fourth ll))))))
 
 #+sbcl
 (defun ipaddr-to-hostname (ipaddr &key ignore-cache)