X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=sockets.lisp;h=a75d77dfe38953b56aa35a34aa10c21b7c5ba917;hp=5bcc7cbf9bcfff6ad32236d3cf78bb7371daf0f9;hb=54cd6cb1b9550ac2310e2c6dffc9cdecd2bdccd3;hpb=f7bbc3121376b8805c6efe808dee8c71cbe327f6 diff --git a/sockets.lisp b/sockets.lisp index 5bcc7cb..a75d77d 100644 --- a/sockets.lisp +++ b/sockets.lisp @@ -1,4 +1,4 @@ -;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: modlisp -*- +;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; @@ -6,8 +6,6 @@ ;;;; Purpose: Socket functions ;;;; Programmer: Kevin M. Rosenberg with excerpts from portableaserve ;;;; Date Started: Jun 2003 -;;;; -;;;; $Id$ ;;;; ************************************************************************* (in-package #:kmrcl) @@ -22,33 +20,38 @@ (defun listen-to-inet-port (&key (port 0) (kind :stream) (reuse nil)) "Create, bind and listen to an inet socket on *:PORT. setsockopt SO_REUSEADDR if :reuse is not nil" + (declare (ignore kind)) (let ((socket (make-instance 'sb-bsd-sockets:inet-socket - :type :stream - :protocol :tcp))) + :type :stream + :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 - (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) + :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 (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) + :reuse-address reuse-address) #-(or allegro clisp cmu sbcl openmcl) (warn "create-inet-listener not supported on this implementation") ) @@ -56,10 +59,10 @@ setsockopt SO_REUSEADDR if :reuse is not nil" (defun make-fd-stream (socket &key input output element-type) #+cmu (sys:make-fd-stream socket :input input :output output - :element-type element-type) + :element-type element-type) #+sbcl (sb-bsd-sockets:socket-make-stream socket :input input :output output - :element-type element-type) + :element-type element-type) #-(or cmu sbcl) (declare (ignore input output element-type)) #-(or cmu sbcl) socket ) @@ -80,13 +83,13 @@ setsockopt SO_REUSEADDR if :reuse is not nil" (values (sys:make-fd-stream sock :input t :output t) sock))) #+sbcl (when (sb-sys:wait-until-fd-usable - (sb-bsd-sockets:socket-file-descriptor listener) :input) + (sb-bsd-sockets:socket-file-descriptor listener) :input) (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,10 +107,10 @@ 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)) + (sb-bsd-sockets:socket-file-descriptor socket)) #+openmcl (close socket) #-(or allegro clisp cmu sbcl openmcl) (warn "close-passive-socket not supported on this implementation") @@ -115,32 +118,35 @@ 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)) (let ((a (logand #xff (ash ipaddr -24))) - (b (logand #xff (ash ipaddr -16))) - (c (logand #xff (ash ipaddr -8))) - (d (logand #xff ipaddr))) + (b (logand #xff (ash ipaddr -16))) + (c (logand #xff (ash ipaddr -8))) + (d (logand #xff ipaddr))) (if values - (values a b c d) + (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) @@ -164,42 +170,49 @@ setsockopt SO_REUSEADDR if :reuse is not nil" "Returns (VALUES STREAM SOCKET)" #+allegro (let ((sock (socket:make-socket :remote-host server - :remote-port port))) + :remote-port port))) (values sock sock)) #+lispworks (let ((sock (comm:open-tcp-stream server port))) (values sock sock)) #+sbcl (let ((sock (make-instance 'sb-bsd-sockets:inet-socket - :type :stream - :protocol :tcp))) + :type :stream + :protocol :tcp))) (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)) + #+clisp + (let ((sock (ext:socket-connect port server))) + (values sock sock)) #+openmcl - (let ((sock (ccl:make-socket :remote-host host :remote-port port ))) + (let ((sock (ccl:make-socket :remote-host server :remote-port port ))) (values sock sock)) ) (defun ipaddr-array-to-dotted (array) (format nil "~{~D~^.~}" (coerce array 'list)) #+ignore - (format nil "~D.~D.~D.~D" - (aref 0 array) (aref 1 array) (aref 2 array) (array 3 array))) + (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 - (nth-value 0 (sb-bsd-sockets:socket-peername socket))) + #+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) ) - +