usocket-cvs

usocket-cvs@common-lisp.net

702 discussions

[usocket-cvs] r578 - usocket/tags/0.5.0
by Erik Huelsmann 12 Mar '11

12 Mar '11

Author: ehuelsmann Date: Sat Mar 12 15:22:35 2011 New Revision: 578 Log: Create 0.5.0 release tag. Added: usocket/tags/0.5.0/ - copied from r577, /usocket/branches/0.5.x/

1 0

[usocket-cvs] r577 - usocket/trunk
by Erik Huelsmann 12 Mar '11

12 Mar '11

Author: ehuelsmann Date: Sat Mar 12 15:21:45 2011 New Revision: 577 Log: Update version number on trunk, with 0.5.x release branch created. Modified: usocket/trunk/usocket.asd Modified: usocket/trunk/usocket.asd ============================================================================== --- usocket/trunk/usocket.asd (original) +++ usocket/trunk/usocket.asd Sat Mar 12 15:21:45 2011 @@ -14,7 +14,7 @@ (defsystem usocket :name "usocket" :author "Erik Enge & Erik Huelsmann" - :version "0.5.0" + :version "0.6.0" :licence "MIT" :description "Universal socket library for Common Lisp" :depends-on (#+sbcl :sb-bsd-sockets)

1 0

[usocket-cvs] r576 - usocket/branches/0.5.x
by Erik Huelsmann 12 Mar '11

12 Mar '11

Author: ehuelsmann Date: Sat Mar 12 15:18:55 2011 New Revision: 576 Log: Create 0.5 release branch. Added: usocket/branches/0.5.x/ - copied from r575, /usocket/trunk/

1 0

[usocket-cvs] r575 - usocket/trunk/backend
by Chun Tian 10 Mar '11

10 Mar '11

Author: ctian Date: Thu Mar 10 05:17:43 2011 New Revision: 575 Log: [SBCL] Merge a patch from Nikodemus Siivola (SBCL maintainer), for "better SOCKET-CONNECT for SBCL". Modified: usocket/trunk/backend/sbcl.lisp Modified: usocket/trunk/backend/sbcl.lisp ============================================================================== --- usocket/trunk/backend/sbcl.lisp (original) +++ usocket/trunk/backend/sbcl.lisp Thu Mar 10 05:17:43 2011 @@ -199,6 +199,11 @@ (if usock-cond (signal usock-cond :socket socket)))))) +(defvar *dummy-stream* + (let ((stream (make-broadcast-stream))) + (close stream) + stream)) + (defun socket-connect (host port &key (protocol :stream) (element-type 'character) timeout deadline (nodelay t nodelay-specified) local-host local-port @@ -219,47 +224,53 @@ (let ((socket (make-instance 'sb-bsd-sockets:inet-socket :type protocol :protocol (case protocol - (:stream :tcp) - (:datagram :udp))))) - (handler-case - (ecase protocol - (:stream - (let* ((stream - (sb-bsd-sockets:socket-make-stream socket - :input t - :output t - :buffering :full - #+sbcl #+sbcl - :timeout timeout - :element-type element-type)) - ;;###FIXME: The above line probably needs an :external-format - (usocket (make-stream-socket :stream stream :socket socket)) - (ip (host-to-vector-quad host))) - ;; binghe: use SOCKOPT-TCP-NODELAY as internal symbol - ;; to pass compilation on ECL without it. - (when (and nodelay-specified sockopt-tcp-nodelay-p) - (setf (sb-bsd-sockets::sockopt-tcp-nodelay socket) nodelay)) - (when (or local-host local-port) - (sb-bsd-sockets:socket-bind socket - (host-to-vector-quad - (or local-host *wildcard-host*)) - (or local-port *auto-port*))) - (with-mapped-conditions (usocket) - (sb-bsd-sockets:socket-connect socket ip port)) - usocket)) - (:datagram - (when (or local-host local-port) - (sb-bsd-sockets:socket-bind socket - (host-to-vector-quad - (or local-host *wildcard-host*)) - (or local-port *auto-port*))) - (when (and host port) - (sb-bsd-sockets:socket-connect socket (host-to-vector-quad host) port)) - (make-datagram-socket socket))) - (t (c) - ;; Make sure we don't leak filedescriptors - (sb-bsd-sockets:socket-close socket) - (error c))))) + (:stream :tcp) + (:datagram :udp)))) + (ip (host-to-vector-quad host)) + (local-host (host-to-vector-quad (or local-host *wildcard-host*))) + (local-port (or local-port *auto-port*)) + usocket ok) + (unwind-protect + (progn + (ecase protocol + (:stream + ;; If make a real socket stream before the socket is + ;; connected, it gets a misleading name so supply a + ;; dummy value to start with. + (setf usocket (make-stream-socket :socket socket :stream *dummy-stream*)) + ;; binghe: use SOCKOPT-TCP-NODELAY as internal symbol + ;; to pass compilation on ECL without it. + (when (and nodelay-specified sockopt-tcp-nodelay-p) + (setf (sb-bsd-sockets::sockopt-tcp-nodelay socket) nodelay)) + (when (or local-host local-port) + (sb-bsd-sockets:socket-bind socket local-host local-port)) + (with-mapped-conditions (usocket) + (sb-bsd-sockets:socket-connect socket ip port) + ;; Now that we're connected make the stream. + (setf (socket-stream usocket) + (sb-bsd-sockets:socket-make-stream socket + :input t + :output t + :buffering :full + #+sbcl #+sbcl + :timeout timeout + :element-type element-type)))) + (:datagram + (when (or local-host local-port) + (sb-bsd-sockets:socket-bind socket + (host-to-vector-quad + (or local-host *wildcard-host*)) + (or local-port *auto-port*))) + (setf usocket (make-datagram-socket socket)) + (when (and host port) + (with-mapped-conditions (usocket) + (sb-bsd-sockets:socket-connect socket ip port) + (setf (connected-p usocket) t))))) + (setf ok t)) + ;; Clean up in case of an error. + (unless ok + (sb-bsd-sockets:socket-close socket :abort t))) + usocket)) (defun socket-listen (host port &key reuseaddress

1 0

[usocket-cvs] r574 - usocket/trunk/backend
by Chun Tian 02 Feb '11

02 Feb '11

Author: ctian Date: Wed Feb 2 01:51:56 2011 New Revision: 574 Log: Clozure CL: wrap SOCKET-LISTEN's HOST argument in HOST-TO-HOSTNAME (Patched by James Ashley <james.ashley(a)gmail.com>) Modified: usocket/trunk/backend/openmcl.lisp Modified: usocket/trunk/backend/openmcl.lisp ============================================================================== --- usocket/trunk/backend/openmcl.lisp (original) +++ usocket/trunk/backend/openmcl.lisp Wed Feb 2 01:51:56 2011 @@ -118,6 +118,7 @@ (backlog 5) (element-type 'character)) (let* ((reuseaddress (if reuse-address-supplied-p reuse-address reuseaddress)) + (real-host (host-to-hostname host)) (sock (with-mapped-conditions () (apply #'openmcl-socket:make-socket (append (list :connect :passive @@ -126,7 +127,7 @@ :backlog backlog :format (to-format element-type)) (when (ip/= host *wildcard-host*) - (list :local-host host))))))) + (list :local-host real-host))))))) (make-stream-server-socket sock :element-type element-type))) (defmethod socket-accept ((usocket stream-server-usocket) &key element-type)

1 0

[usocket-cvs] r573 - usocket/trunk/backend
by Chun Tian 06 Jan '11

06 Jan '11

Author: ctian Date: Wed Jan 5 18:16:16 2011 New Revision: 573 Log: CLISP: work around on linksets without FFI Modified: usocket/trunk/backend/clisp.lisp Modified: usocket/trunk/backend/clisp.lisp ============================================================================== --- usocket/trunk/backend/clisp.lisp (original) +++ usocket/trunk/backend/clisp.lisp Wed Jan 5 18:16:16 2011 @@ -5,8 +5,8 @@ (in-package :usocket) - ;; utility routine for looking up the current host name +#+ffi (FFI:DEF-CALL-OUT get-host-name-internal (:name "gethostname") (:arguments (name (FFI:C-PTR (FFI:C-ARRAY-MAX ffi:character 256)) @@ -19,11 +19,13 @@ (:return-type ffi:int)) (defun get-host-name () + #+ffi (multiple-value-bind (retcode name) (get-host-name-internal 256) (when (= retcode 0) - name))) - + name)) + #-ffi + "localhost") #+win32 (defun remap-maybe-for-win32 (z) @@ -256,5 +258,4 @@ (warn "This image doesn't contain the RAWSOCK package. To enable UDP socket support, please be sure to use the -Kfull parameter at startup, or to enable RAWSOCK support during compilation.") - )

1 0

[usocket-cvs] r572 - usocket/trunk/backend
by Chun Tian 08 Dec '10

08 Dec '10

Author: ctian Date: Wed Dec 8 03:17:40 2010 New Revision: 572 Log: LispWorks: SOCKET-CONNECT's TIMEOUT argument should be used to set up UDP read timeout (RCVTIMEO), fixes for other platforms still needed. Modified: usocket/trunk/backend/lispworks.lisp Modified: usocket/trunk/backend/lispworks.lisp ============================================================================== --- usocket/trunk/backend/lispworks.lisp (original) +++ usocket/trunk/backend/lispworks.lisp Wed Dec 8 03:17:40 2010 @@ -300,9 +300,11 @@ (if (and host port) (connect-to-udp-server (host-to-hostname host) port :local-address (and local-host (host-to-hostname local-host)) - :local-port local-port) + :local-port local-port + :read-timeout timeout) (open-udp-socket :local-address (and local-host (host-to-hostname local-host)) - :local-port local-port)) + :local-port local-port + :read-timeout timeout)) :connected-p t))) (hcl:flag-special-free-action usocket) usocket))))

1 0

[usocket-cvs] r571 - usocket/trunk/backend
by Chun Tian 08 Dec '10

08 Dec '10

Author: ctian Date: Wed Dec 8 01:33:01 2010 New Revision: 571 Log: LispWorks: UDP receive timeout parameter (patched by Kamil Shakirov) Modified: usocket/trunk/backend/lispworks.lisp Modified: usocket/trunk/backend/lispworks.lisp ============================================================================== --- usocket/trunk/backend/lispworks.lisp (original) +++ usocket/trunk/backend/lispworks.lisp Wed Dec 8 01:33:01 2010 @@ -442,11 +442,12 @@ :copy-foreign-object nil))) (values nil n 0 0))))))) -(defmethod socket-receive ((socket datagram-usocket) buffer length &key) +(defmethod socket-receive ((socket datagram-usocket) buffer length &key timeout) (multiple-value-bind (buffer size host port) (receive-message (socket socket) (slot-value socket 'recv-buffer) - buffer length) + buffer length + :read-timeout timeout) (values buffer size host port))) (defmethod get-local-name ((usocket usocket))

1 0

[usocket-cvs] r570 - in usocket/trunk: . backend
by Chun Tian 08 Dec '10

08 Dec '10

Author: ctian Date: Tue Dec 7 23:43:05 2010 New Revision: 570 Log: LispWorks: concurrent recv/send on mutiple UDP sockets. Patched by Kamil Shakirov <kamils80(a)gmail.com> Modified: usocket/trunk/backend/lispworks.lisp usocket/trunk/usocket.lisp Modified: usocket/trunk/backend/lispworks.lisp ============================================================================== --- usocket/trunk/backend/lispworks.lisp (original) +++ usocket/trunk/backend/lispworks.lisp Tue Dec 7 23:43:05 2010 @@ -358,48 +358,41 @@ "Additional socket-close method for datagram-usocket" (setf (%open-p socket) nil)) -(defvar *message-send-buffer* - (make-array +max-datagram-packet-size+ - :element-type '(unsigned-byte 8) - :allocation :static)) +(defmethod initialize-instance :after ((socket datagram-usocket) &key) + (setf (slot-value socket 'send-buffer) + (make-array +max-datagram-packet-size+ + :element-type '(unsigned-byte 8) + :allocation :static)) + (setf (slot-value socket 'recv-buffer) + (make-array +max-datagram-packet-size+ + :element-type '(unsigned-byte 8) + :allocation :static))) -(defvar *message-send-lock* - (mp:make-lock :name "USOCKET message send lock")) - -(defun send-message (socket-fd buffer &optional (length (length buffer)) host service) +(defun send-message (socket-fd message buffer &optional (length (length buffer)) host service) "Send message to a socket, using sendto()/send()" (declare (type integer socket-fd) (type sequence buffer)) - (let ((message *message-send-buffer*)) - (fli:with-dynamic-foreign-objects ((client-addr (:struct comm::sockaddr_in)) - (len :int - #-(or lispworks4 lispworks5.0) ; <= 5.0 - :initial-element - (fli:size-of '(:struct comm::sockaddr_in)))) - (fli:with-dynamic-lisp-array-pointer (ptr message :type '(:unsigned :byte)) - (mp:with-lock (*message-send-lock*) - (replace message buffer :end2 length) - (if (and host service) - (progn - (comm::initialize-sockaddr_in client-addr comm::*socket_af_inet* host service "udp") - (%sendto socket-fd ptr (min length +max-datagram-packet-size+) 0 - (fli:copy-pointer client-addr :type '(:struct comm::sockaddr)) - (fli:dereference len))) - (comm::%send socket-fd ptr (min length +max-datagram-packet-size+) 0))))))) + (fli:with-dynamic-foreign-objects ((client-addr (:struct comm::sockaddr_in)) + (len :int + #-(or lispworks4 lispworks5.0) ; <= 5.0 + :initial-element + (fli:size-of '(:struct comm::sockaddr_in)))) + (fli:with-dynamic-lisp-array-pointer (ptr message :type '(:unsigned :byte)) + (replace message buffer :end2 length) + (if (and host service) + (progn + (comm::initialize-sockaddr_in client-addr comm::*socket_af_inet* host service "udp") + (%sendto socket-fd ptr (min length +max-datagram-packet-size+) 0 + (fli:copy-pointer client-addr :type '(:struct comm::sockaddr)) + (fli:dereference len))) + (comm::%send socket-fd ptr (min length +max-datagram-packet-size+) 0))))) (defmethod socket-send ((socket datagram-usocket) buffer length &key host port) - (let ((s (socket socket))) - (send-message s buffer length (and host (host-to-hbo host)) port))) - -(defvar *message-receive-buffer* - (make-array +max-datagram-packet-size+ - :element-type '(unsigned-byte 8) - :allocation :static)) - -(defvar *message-receive-lock* - (mp:make-lock :name "USOCKET message receive lock")) + (send-message (socket socket) + (slot-value socket 'send-buffer) + buffer length (and host (host-to-hbo host)) port)) -(defun receive-message (socket-fd &optional buffer (length (length buffer)) +(defun receive-message (socket-fd message &optional buffer (length (length buffer)) &key read-timeout (max-buffer-size +max-datagram-packet-size+)) "Receive message from socket, read-timeout is a float number in seconds. @@ -410,8 +403,7 @@ 4. remote port" (declare (type integer socket-fd) (type sequence buffer)) - (let ((message *message-receive-buffer*) - old-timeout) + (let (old-timeout) (fli:with-dynamic-foreign-objects ((client-addr (:struct comm::sockaddr_in)) (len :int #-(or lispworks4 lispworks5.0) ; <= 5.0 @@ -422,40 +414,40 @@ (when read-timeout (setf old-timeout (get-socket-receive-timeout socket-fd)) (set-socket-receive-timeout socket-fd read-timeout)) - (mp:with-lock (*message-receive-lock*) - (let ((n (%recvfrom socket-fd ptr max-buffer-size 0 - (fli:copy-pointer client-addr :type '(:struct comm::sockaddr)) - len))) - ;; restore old read timeout - (when (and read-timeout (/= old-timeout read-timeout)) - (set-socket-receive-timeout socket-fd old-timeout)) - (if (plusp n) - (values (if buffer - (replace buffer message - :end1 (min length max-buffer-size) - :end2 (min n max-buffer-size)) + (let ((n (%recvfrom socket-fd ptr max-buffer-size 0 + (fli:copy-pointer client-addr :type '(:struct comm::sockaddr)) + len))) + ;; restore old read timeout + (when (and read-timeout (/= old-timeout read-timeout)) + (set-socket-receive-timeout socket-fd old-timeout)) + (if (plusp n) + (values (if buffer + (replace buffer message + :end1 (min length max-buffer-size) + :end2 (min n max-buffer-size)) (subseq message 0 (min n max-buffer-size))) - (min n max-buffer-size) - (comm::ntohl (fli:foreign-slot-value - (fli:foreign-slot-value client-addr - 'comm::sin_addr - :object-type '(:struct comm::sockaddr_in) - :type '(:struct comm::in_addr) - :copy-foreign-object nil) - 'comm::s_addr - :object-type '(:struct comm::in_addr))) - (comm::ntohs (fli:foreign-slot-value client-addr - 'comm::sin_port - :object-type '(:struct comm::sockaddr_in) - :type '(:unsigned :short) - :copy-foreign-object nil))) - (values nil n 0 0)))))))) + (min n max-buffer-size) + (comm::ntohl (fli:foreign-slot-value + (fli:foreign-slot-value client-addr + 'comm::sin_addr + :object-type '(:struct comm::sockaddr_in) + :type '(:struct comm::in_addr) + :copy-foreign-object nil) + 'comm::s_addr + :object-type '(:struct comm::in_addr))) + (comm::ntohs (fli:foreign-slot-value client-addr + 'comm::sin_port + :object-type '(:struct comm::sockaddr_in) + :type '(:unsigned :short) + :copy-foreign-object nil))) + (values nil n 0 0))))))) (defmethod socket-receive ((socket datagram-usocket) buffer length &key) - (let ((s (socket socket))) - (multiple-value-bind (buffer size host port) - (receive-message s buffer length) - (values buffer size host port)))) + (multiple-value-bind (buffer size host port) + (receive-message (socket socket) + (slot-value socket 'recv-buffer) + buffer length) + (values buffer size host port))) (defmethod get-local-name ((usocket usocket)) (multiple-value-bind Modified: usocket/trunk/usocket.lisp ============================================================================== --- usocket/trunk/usocket.lisp (original) +++ usocket/trunk/usocket.lisp Tue Dec 7 23:43:05 2010 @@ -104,7 +104,13 @@ :accessor %open-p :initform t :documentation "Flag to indicate if usocket is open, -for GC on implementions operate on raw socket fd.")) +for GC on implementions operate on raw socket fd.") + #+lispworks + (recv-buffer + :documentation "Private RECV buffer.") + #+lispworks + (send-buffer + :documentation "Private SEND buffer.")) (:documentation "UDP (inet-datagram) socket")) (defun usocket-p (socket)

1 0

[usocket-cvs] r569 - usocket/trunk
by Chun Tian 05 Oct '10

05 Oct '10

Author: ctian Date: Tue Oct 5 02:20:54 2010 New Revision: 569 Log: Update TODO Modified: usocket/trunk/TODO (contents, props changed) Modified: usocket/trunk/TODO ============================================================================== --- usocket/trunk/TODO (original) +++ usocket/trunk/TODO Tue Oct 5 02:20:54 2010 @@ -1,4 +1,7 @@ -- Fix condition systems (make all implementation generate same error) -- Add INET6 support. - -For more TODO items, see http://trac.common-lisp.net/usocket/report. +- Fix condition systems (making all implementation generate same error) +- Add INET6 support. +- UDP support for Digitool MCL +- IOlib backend +- SOCKET-OPTION (at least :BROADCAST and :READ-TIMEOUT) + +For more TODO items, see http://trac.common-lisp.net/usocket/report.

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

usocket-cvs