X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Finet.lisp;h=4cc06848df78cbfb0c45c392aba738f432b500bd;hb=85483d976cc2d779493985f77f39efefb2ea622b;hp=f6a7c1771d1b1b084b90fcd634074165a35ce001;hpb=3bdadd34bc876d4f91f1ac781a77b4f41a506baf;p=sbcl.git
diff --git a/contrib/sb-bsd-sockets/inet.lisp b/contrib/sb-bsd-sockets/inet.lisp
index f6a7c17..4cc0684 100644
--- a/contrib/sb-bsd-sockets/inet.lisp
+++ b/contrib/sb-bsd-sockets/inet.lisp
@@ -1,21 +1,18 @@
(in-package :sb-bsd-sockets)
-#||
INET-domain sockets
-
-The TCP and UDP sockets that you know and love. Some representation issues:
-
-- These functions do not accept hostnames directly: see name resolution
-
- Internet addresses are represented by sequences of (unsigned-byte 8) - viz. #(127 0 0 1). Ports are just integers: 6010. No conversion between network- and host-order data is needed from the user of this package.
-
- socket addresses are represented by the two values for address and port, so for example, (socket-connect s #(192 168 1 1) 80)
-
-
-|#
-
;;; Our class and constructor
(eval-when (:compile-toplevel :load-toplevel :execute)
(defclass inet-socket (socket)
- ((family :initform sockint::AF-INET))))
+ ((family :initform sockint::AF-INET))
+ (:documentation "Class representing TCP and UDP sockets.
+
+Examples:
+
+ (make-instance 'inet-socket :type :stream :protocol :tcp)
+
+ (make-instance 'inet-socket :type :datagram :protocol :udp)
+")))
;;; XXX should we *...* this?
(defparameter inet-address-any (vector 0 0 0 0))
@@ -55,7 +52,7 @@ using getprotobyname(2) which typically looks in NIS or /etc/protocols"
;; 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 (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))
@@ -76,11 +73,11 @@ using getprotobyname(2) which typically looks in NIS or /etc/protocols"
"Returns address and port of SOCKADDR as multiple values"
(values
(coerce (loop for i from 0 below 4
- collect (sb-alien:deref (sockint::sockaddr-in-addr sockaddr) i))
- '(vector (unsigned-byte 8) 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"
(make-instance 'inet-socket :type type :protocol protocol))