0.8.10.56:

[sbcl.git] / contrib / sb-bsd-sockets / inet.lisp

diff --git a/contrib/sb-bsd-sockets/inet.lisp b/contrib/sb-bsd-sockets/inet.lisp
index 3ea609e..59f95f0 100644 (file)
--- a/contrib/sb-bsd-sockets/inet.lisp
+++ b/contrib/sb-bsd-sockets/inet.lisp
@@ -26,10 +26,9 @@
 (defun make-inet-address (dotted-quads)
   "Return a vector of octets given a string DOTTED-QUADS in the format
 \"127.0.0.1\""
-  (coerce
-   (mapcar #'parse-integer
-           (split dotted-quads nil '(#\.)))
-   'vector))
+  (map 'vector
+       #'parse-integer
+       (split dotted-quads nil '(#\.))))
 
 ;;; getprotobyname only works in the internet domain, which is why this
 ;;; is here
@@ -38,52 +37,49 @@
 using getprotobyname(2) which typically looks in NIS or /etc/protocols"
   ;; for extra brownie points, could return canonical protocol name
   ;; and aliases as extra values
-  (let ((ent (sb-grovel::foreign-vector (sockint::getprotobyname name) 1
-                                       sockint::size-of-protoent)))
+  (let ((ent (sockint::getprotobyname name)))
     (sockint::protoent-proto ent)))
 
-
-;;; sockaddr protocol
-;;; (1) sockaddrs are represented as the semi-foreign array-of-octets
-;;; thing
-;;; (2) a protocol provides make-sockaddr-for, size-of-sockaddr,
+;;; our protocol provides make-sockaddr-for, size-of-sockaddr,
 ;;; bits-of-sockaddr
 
 (defmethod make-sockaddr-for ((socket inet-socket) &optional sockaddr &rest address &aux (host (first address)) (port (second address)))
   (let ((sockaddr (or sockaddr (sockint::allocate-sockaddr-in))))
     (when (and host port)
+      (setf host (coerce host '(simple-array (unsigned-byte 8) (4))))
       ;; port and host are represented in C as "network-endian" unsigned
       ;; integers of various lengths.  This is stupid.  The value of the
       ;; integer doesn't matter (and will change depending on your
       ;; machine's endianness); what the bind(2) call is interested in
       ;; is the pattern of bytes within that integer.
-      
+
       ;; We have no truck with such dreadful type punning.  Octets to
       ;; octets, dust to dust.
       
       (setf (sockint::sockaddr-in-family sockaddr) sockint::af-inet)
-      (setf (sockint::sockaddr-in-port sockaddr 0) (ldb (byte 8 8) port))
-      (setf (sockint::sockaddr-in-port sockaddr 1) (ldb (byte 8 0) port))
-      
-      (setf (sockint::sockaddr-in-addr sockaddr 0) (elt host 0))
-      (setf (sockint::sockaddr-in-addr sockaddr 1) (elt host 1))
-      (setf (sockint::sockaddr-in-addr sockaddr 2) (elt host 2))
-      (setf (sockint::sockaddr-in-addr sockaddr 3) (elt host 3)))
+      (setf (sb-alien:deref (sockint::sockaddr-in-port sockaddr) 0) (ldb (byte 8 8) port))
+      (setf (sb-alien:deref (sockint::sockaddr-in-port sockaddr) 1) (ldb (byte 8 0) port))
+
+      (setf (sb-alien:deref (sockint::sockaddr-in-addr sockaddr) 0) (elt host 0))
+      (setf (sb-alien:deref (sockint::sockaddr-in-addr sockaddr) 1) (elt host 1))
+      (setf (sb-alien:deref (sockint::sockaddr-in-addr sockaddr) 2) (elt host 2))
+      (setf (sb-alien:deref (sockint::sockaddr-in-addr sockaddr) 3) (elt host 3)))
     sockaddr))
 
+(defmethod free-sockaddr-for ((socket inet-socket) sockaddr)
+  (sockint::free-sockaddr-in sockaddr))
+
 (defmethod size-of-sockaddr ((socket inet-socket))
   sockint::size-of-sockaddr-in)
 
 (defmethod bits-of-sockaddr ((socket inet-socket) sockaddr)
   "Returns address and port of SOCKADDR as multiple values"
   (values
-   (vector
-    (sockint::sockaddr-in-addr sockaddr 0) 
-    (sockint::sockaddr-in-addr sockaddr 1) 
-    (sockint::sockaddr-in-addr sockaddr 2) 
-    (sockint::sockaddr-in-addr sockaddr 3))
-   (+ (* 256 (sockint::sockaddr-in-port sockaddr 0))
-      (sockint::sockaddr-in-port sockaddr 1))))  
+   (coerce (loop for i from 0 below 4
+                collect (sb-alien:deref (sockint::sockaddr-in-addr sockaddr) i))
+          '(vector (unsigned-byte 8) 4))
+   (+ (* 256 (sb-alien:deref (sockint::sockaddr-in-port sockaddr) 0))
+      (sb-alien:deref (sockint::sockaddr-in-port sockaddr) 1))))
    
 (defun make-inet-socket (type protocol)
   "Make an INET socket.  Deprecated in favour of make-instance"