Author: ctian Date: Tue Oct 28 12:02:38 2008 New Revision: 471

Log: [bugfix] merge from trunk (r469)

Modified: usocket/branches/experimental-udp/backend/cmucl.lisp usocket/branches/experimental-udp/backend/scl.lisp

Modified: usocket/branches/experimental-udp/backend/cmucl.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/cmucl.lisp (original) +++ usocket/branches/experimental-udp/backend/cmucl.lisp Tue Oct 28 12:02:38 2008 @@ -71,7 +71,8 @@ (setf socket (let ((args (list (host-to-hbo host) port protocol))) (when (and local-bind-p (or local-host-p local-port-p)) - (nconc args (list :local-host (host-to-hbo local-host) + (nconc args (list :local-host (when local-host + (host-to-hbo local-host)) :local-port local-port))) (with-mapped-conditions (socket) (apply #'ext:connect-to-inet-socket args)))) @@ -90,7 +91,8 @@ (if (and host port) (let ((args (list (host-to-hbo host) port protocol))) (when (and local-bind-p (or local-host-p local-port-p)) - (nconc args (list :local-host (host-to-hbo local-host) + (nconc args (list :local-host (when local-host + (host-to-hbo local-host)) :local-port local-port))) (with-mapped-conditions (socket) (apply #'ext:connect-to-inet-socket args)))

Modified: usocket/branches/experimental-udp/backend/scl.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/scl.lisp (original) +++ usocket/branches/experimental-udp/backend/scl.lisp Tue Oct 28 12:02:38 2008 @@ -66,7 +66,8 @@ (if (and host port) (let ((args (list (host-to-hbo host) port :kind protocol))) (when (and patch-udp-p (or local-host-p local-port-p)) - (nconc args (list :local-host (host-to-hbo local-host) + (nconc args (list :local-host (when local-host + (host-to-hbo local-host)) :local-port local-port))) (with-mapped-conditions (socket) (apply #'ext:connect-to-inet-socket args))) @@ -74,9 +75,10 @@ (with-mapped-conditions () (ext:create-inet-listener (or local-port 0) protocol - :host (if (ip= host *wildcard-host*) - 0 - (host-to-hbo local-host)))) + :host (when local-host + (if (ip= host *wildcard-host*) + 0 + (host-to-hbo local-host))))) (with-mapped-conditions () (ext:create-inet-socket protocol))))) (let ((usocket (make-datagram-socket socket)))