X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=contrib%2Fsb-bsd-sockets%2Finet.lisp;h=57ab02c87c08669ee1eecf643e98ca7a45bb72da;hb=7151bf7c85c030abbef3630a5241fd411cad6c5f;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..57ab02c 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))
@@ -25,10 +22,37 @@
(defun make-inet-address (dotted-quads)
"Return a vector of octets given a string DOTTED-QUADS in the format
-\"127.0.0.1\""
- (map 'vector
- #'parse-integer
- (split dotted-quads nil '(#\.))))
+\"127.0.0.1\". Signals an error if the string is malformed."
+ (declare (type string dotted-quads))
+ (labels ((oops ()
+ (error "~S is not a string designating an IP address."
+ dotted-quads))
+ (check (x)
+ (if (typep x '(unsigned-byte 8))
+ x
+ (oops))))
+ (let* ((s1 (position #\. dotted-quads))
+ (s2 (if s1 (position #\. dotted-quads :start (1+ s1)) (oops)))
+ (s3 (if s2 (position #\. dotted-quads :start (1+ s2)) (oops)))
+ (u0 (parse-integer dotted-quads :end s1))
+ (u1 (parse-integer dotted-quads :start (1+ s1) :end s2))
+ (u2 (parse-integer dotted-quads :start (1+ s2) :end s3)))
+ (multiple-value-bind (u3 end) (parse-integer dotted-quads :start (1+ s3) :junk-allowed t)
+ (unless (= end (length dotted-quads))
+ (oops))
+ (let ((vector (make-array 4 :element-type '(unsigned-byte 8))))
+ (setf (aref vector 0) (check u0)
+ (aref vector 1) (check u1)
+ (aref vector 2) (check u2)
+ (aref vector 3) (check u3))
+ vector)))))
+
+(define-condition unknown-protocol ()
+ ((name :initarg :name
+ :reader unknown-protocol-name))
+ (:report (lambda (c s)
+ (format s "Protocol not found: ~a" (prin1-to-string
+ (unknown-protocol-name c))))))
;;; getprotobyname only works in the internet domain, which is why this
;;; is here
@@ -38,6 +62,8 @@ 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 (sockint::getprotobyname name)))
+ (if (sb-alien::null-alien ent)
+ (error 'unknown-protocol :name name))
(sockint::protoent-proto ent)))
;;; our protocol provides make-sockaddr-for, size-of-sockaddr,
@@ -55,7 +81,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 +102,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))