projects
/
kmrcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r11093: 04 Sep 2006 Kevin Rosenberg <kevin@rosenberg.net>
[kmrcl.git]
/
sockets.lisp
diff --git
a/sockets.lisp
b/sockets.lisp
index f105501777be5e122c3cdf012c5c44ff6ca0b1e9..2d9a8ff0765072e03b5c43d5916f87a90fd7b110 100644
(file)
--- 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
(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)))
sock)))
#+openmcl
(let ((sock (ccl:accept-connection listener :wait t)))
@@
-115,7
+115,8
@@
setsockopt SO_REUSEADDR if :reuse is not nil"
(defun close-active-socket (socket)
(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."
(defun ipaddr-to-dotted (ipaddr &key values)
"Convert from 32-bit integer to dotted string."
@@
-133,12
+134,16
@@
setsockopt SO_REUSEADDR if :reuse is not nil"
(declare (string dotted))
(if errorp
(let ((ll (delimited-string-to-list dotted #\.)))
(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)
@@
-174,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
(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)))
sock))
#+cmu
(let ((sock (ext:connect-to-inet-socket server port)))