X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Finet.lisp;h=ebe6e35ab5ac80b5484300d517d00485c0aeac95;hb=2d68a49fe9d30f687da45cfe7a02b497cb91137c;hp=5879341567a3b60c0764ccc0c563cb2a56d60309;hpb=5eb1bc45f5bd68638ae861dd8bd81c33ae6cd14d;p=sbcl.git diff --git a/contrib/sb-bsd-sockets/inet.lisp b/contrib/sb-bsd-sockets/inet.lisp index 5879341..ebe6e35 100644 --- a/contrib/sb-bsd-sockets/inet.lisp +++ b/contrib/sb-bsd-sockets/inet.lisp @@ -17,15 +17,45 @@ Examples: ;;; XXX should we *...* this? (defparameter inet-address-any (vector 0 0 0 0)) +(defmethod socket-namestring ((socket inet-socket)) + (ignore-errors + (multiple-value-bind (addr port) (socket-name socket) + (format nil "~{~A~^.~}:~A" (coerce addr 'list) port)))) + +(defmethod socket-peerstring ((socket inet-socket)) + (ignore-errors + (multiple-value-bind (addr port) (socket-peername socket) + (format nil "~{~A~^.~}:~A" (coerce addr 'list) port)))) + ;;; binding a socket to an address and port. Doubt that anyone's ;;; actually using this much, to be honest. (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 @@ -34,17 +64,89 @@ Examples: (format s "Protocol not found: ~a" (prin1-to-string (unknown-protocol-name c)))))) +#+(and sb-thread (not os-provides-getprotoby-r)) +;; Since getprotobyname is not thread-safe, we need a lock. +(sb-ext:defglobal **getprotoby-lock** (sb-thread:make-mutex :name "getprotoby lock")) + ;;; getprotobyname only works in the internet domain, which is why this ;;; is here (defun get-protocol-by-name (name) ;exported - "Returns the network protocol number associated with the string NAME, -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-grovel::foreign-nullp ent) - (error 'unknown-protocol :name name)) - (sockint::protoent-proto ent))) + "Given a protocol name, return the protocol number, the protocol name, and +a list of protocol aliases" + + ;; Brownie Points. Hopefully there's one person out there using + ;; RSPF sockets and SBCL who will appreciate the extra info + (labels ((protoent-to-values (protoent) + (values + (sockint::protoent-proto protoent) + (sockint::protoent-name protoent) + (let ((index 0)) + (loop + for alias = (sb-alien:deref + (sockint::protoent-aliases protoent) index) + while (not (sb-alien:null-alien alias)) + do (incf index) + collect (sb-alien::c-string-to-string + (sb-alien:alien-sap alias) + (sb-impl::default-external-format) + 'character)))))) + #+(and sb-thread os-provides-getprotoby-r) + (let ((buffer-length 1024) + (max-buffer 10000) + (result-buf nil) + (buffer nil) + #-solaris + (result nil)) + (declare (type fixnum buffer-length) + (type fixnum max-buffer)) + (loop + (unwind-protect + (progn + (setf result-buf (sb-alien:make-alien sockint::protoent) + buffer (sb-alien:make-alien sb-alien:char buffer-length)) + #-solaris + (setf result (sb-alien:make-alien (* sockint::protoent))) + (when (or (sb-alien:null-alien result-buf) + (sb-alien:null-alien buffer) + (sb-alien:null-alien result)) + (error "Could not allocate foreign memory.")) + (let ((res (sockint::getprotobyname-r + name result-buf buffer buffer-length #-solaris result))) + (cond ((eql res 0) + #-solaris + (when (sb-alien::null-alien (sb-alien:deref result 0)) + (error 'unknown-protocol :name name)) + (return-from get-protocol-by-name + (protoent-to-values result-buf))) + (t + (let ((errno (sb-unix::get-errno))) + (cond ((eql errno sockint::erange) + (incf buffer-length 1024) + (when (> buffer-length max-buffer) + (error "Exceeded max-buffer of ~d" max-buffer))) + (t + (error "Unexpected errno ~d" errno)))))))) + (when result-buf + (sb-alien:free-alien result-buf)) + (when buffer + (sb-alien:free-alien buffer)) + #-solaris + (when result + (sb-alien:free-alien result))))) + #-(and sb-thread os-provides-getprotoby-r) + (tagbody + (flet ((get-it () + (let ((ent (sockint::getprotobyname name))) + (if (sb-alien::null-alien ent) + (go :error) + (return-from get-protocol-by-name (protoent-to-values ent)))))) + #+sb-thread + (sb-thread::with-system-mutex (**getprotoby-lock**) + (get-it)) + #-sb-thread + (get-it)) + :error + (error 'unknown-protocol :name name)))) ;;; our protocol provides make-sockaddr-for, size-of-sockaddr, ;;; bits-of-sockaddr