Commit c103f14af3232e2e10f659730214451bca06c580
2017-06-27T18:05:22
connect, bind, with-sockaddr-in
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
diff --git a/cffi-socket.lisp b/cffi-socket.lisp
index a9cfe4d..ae3c19a 100644
--- a/cffi-socket.lisp
+++ b/cffi-socket.lisp
@@ -44,10 +44,27 @@
(sa-family sa-family-t)
(sa-data :char :count 14))
+(defcfun ("connect" c-connect) :int
+ (sockfd :int)
+ (addr (:pointer (:struct sockaddr)))
+ (addrlen socklen-t))
+
+(defun connect (sockfd addr addrlen)
+ (let ((r (c-connect sockfd addr addrlen)))
+ (when (< r 0)
+ (error-errno "connect"))
+ r))
+
(defcfun ("bind" c-bind) :int
(sockfd :int)
(addr (:pointer (:struct sockaddr)))
- (addrlen :int))
+ (addrlen socklen-t))
+
+(defun bind (sockfd addr addrlen)
+ (let ((r (c-bind sockfd addr addrlen)))
+ (when (< r 0)
+ (error-errno "bind"))
+ r))
(defcfun "htons" uint16-t
(hostshort uint16-t))
@@ -87,20 +104,24 @@
((unsigned-byte 32) x)
(string (or (inet-addr-from-string x)))))
-
-(defun bind-inet (sockfd addr port)
- (with-foreign-object (addr-in '(:struct sockaddr))
- (with-foreign-slots ((sin-family sin-port sin-addr)
- addr-in (:struct sockaddr-in))
- (let ((inet-addr (inet-addr addr)))
- (setf sin-family +af-inet+
- sin-port (htons port)
- sin-addr inet-addr)))
- (let ((r (c-bind sockfd addr-in (foreign-type-size
- '(:struct sockaddr-in)))))
- (when (< r 0)
- (error-errno "bind"))
- r)))
+(defmacro with-sockaddr-in ((sockaddr sockaddrlen host port) &body body)
+ (declare (type symbol sockaddr sockaddrlen))
+ `(with-foreign-object (,sockaddr '(:struct sockaddr))
+ (with-foreign-slots ((sin-family sin-port sin-addr)
+ ,sockaddr (:struct sockaddr-in))
+ (setf sin-family +af-inet+
+ sin-port (htons ,port)
+ sin-addr (inet-addr ,host)))
+ (let ((,sockaddrlen (foreign-type-size '(:struct sockaddr-in))))
+ ,@body)))
+
+(defun connect-inet (sockfd host port)
+ (with-sockaddr-in (addr addrlen host port)
+ (connect sockfd addr addrlen)))
+
+(defun bind-inet (sockfd host port)
+ (with-sockaddr-in (addr addr-len host port)
+ (bind sockfd addr addr-len)))
(defcfun ("listen" c-listen) :int
(sockfd :int)
diff --git a/package.lisp b/package.lisp
index 93acbf3..c9c4b9a 100644
--- a/package.lisp
+++ b/package.lisp
@@ -44,6 +44,10 @@
#:file-descriptor
#:socket
#:with-socket
+ #:with-sockaddr-in
+ #:connect
+ #:connect-inet
+ #:bind
#:bind-inet
#:listen
#:accept