projects
/
kmrcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r11323: add uri-query-to-alist
[kmrcl.git]
/
sockets.lisp
diff --git
a/sockets.lisp
b/sockets.lisp
index 74fa27e1a82d9d8acf6a5adc8535eea213648d3a..74b4f36a13c042bc6240d9504465f7edb7f41883 100644
(file)
--- a/
sockets.lisp
+++ b/
sockets.lisp
@@
-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)
#+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")
)
(warn "create-inet-listener not supported on this implementation")
)
@@
-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
(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)))
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")
)
(warn "accept-tcp-connection not supported on this implementation")
)
@@
-98,19
+104,20
@@
setsockopt SO_REUSEADDR if :reuse is not nil"
(defun close-passive-socket (socket)
#+allegro (close socket)
(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))
#+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)
(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))
(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))))
(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 #\.)))
(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 #\.)))
(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)
#+sbcl
(defun ipaddr-to-hostname (ipaddr &key ignore-cache)
@@
-169,13
+179,19
@@
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
(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
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))
(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))
)
(defun ipaddr-array-to-dotted (array)
)
(defun ipaddr-array-to-dotted (array)
@@
-190,5
+206,10
@@
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))
#+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)
)
)