Commit dccd1f4ebb93763b664b482d031b4dcaf51d198b
2019-01-16T17:32:34
Fix 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 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105
diff --git a/cffi-socket.lisp b/cffi-socket.lisp
index a3edfbd..e7edf10 100644
--- a/cffi-socket.lisp
+++ b/cffi-socket.lisp
@@ -69,6 +69,24 @@
(defun htons (hostshort)
(c-htons hostshort))
+(defcfun ("ntohs" c-ntohs) uint16-t
+ (netshort uint16-t))
+
+(defun ntohs (netshort)
+ (c-ntohs netshort))
+
+(defcfun ("htonl" c-htonl) uint32-t
+ (host32 uint32-t))
+
+(defun htonl (host32)
+ (c-htonl host32))
+
+(defcfun ("ntohl" c-ntohl) uint32-t
+ (net32 uint32-t))
+
+(defun ntohl (net32)
+ (c-ntohl net32))
+
;; IP
(defun inet-addr-from-string (x &key (start 0) (end (length x)))
@@ -100,6 +118,16 @@
((unsigned-byte 32) x)
(string (or (inet-addr-from-string x)))))
+(defun sockaddr-to-string (sockaddr)
+ (with-foreign-slots ((sin-port sin-addr)
+ sockaddr (:struct sockaddr-in))
+ (format nil "~D.~D.~D.~D:~D"
+ (mod sin-addr 256)
+ (mod (ash sin-addr -8 ) 256)
+ (mod (ash sin-addr -16) 256)
+ (mod (ash sin-addr -24) 256)
+ (ntohs sin-port))))
+
(defmacro with-sockaddr-in ((sockaddr sockaddrlen host port) &body body)
(declare (type symbol sockaddr sockaddrlen))
`(with-foreign-object (,sockaddr '(:struct sockaddr))
@@ -107,7 +135,7 @@
,sockaddr (:struct sockaddr-in))
(setf sin-family +af-inet+
sin-port (htons ,port)
- sin-addr (inet-addr ,host)))
+ sin-addr (htonl (inet-addr ,host))))
(let ((,sockaddrlen (foreign-type-size '(:struct sockaddr-in))))
,@body)))
@@ -138,7 +166,7 @@
(with-foreign-object (addr '(:struct sockaddr-in))
(with-foreign-object (addrlen :int)
(setf (mem-ref addrlen :int) (foreign-type-size '(:struct sockaddr-in)))
- (let ((s (c-accept sockfd addr addrlen)))
+ (let ((s (the integer (c-accept sockfd addr addrlen))))
(cond ((<= 0 s)
(values s addr))
((or (= errno +eagain+)
diff --git a/grovel-socket.lisp b/grovel-socket.lisp
index f4de110..24a7d6c 100644
--- a/grovel-socket.lisp
+++ b/grovel-socket.lisp
@@ -51,6 +51,10 @@
(ctype uint16-t "uint16_t")
(ctype uint32-t "uint32_t")
+(ctype in-addr-t "in_addr_t")
+
+(cstruct in-addr "struct in_addr"
+ (s-addr "s_addr" :type in-addr-t))
;; IP
diff --git a/package.lisp b/package.lisp
index 7201b06..83a74b5 100644
--- a/package.lisp
+++ b/package.lisp
@@ -49,6 +49,7 @@
#:c-connect
#:c-htons
#:c-listen
+ #:c-ntohs
#:c-recv
#:c-send
#:c-shutdown
@@ -59,11 +60,13 @@
#:inet-addr
#:inet-addr-from-string
#:listen
+ #:ntohs
#:recv
#:recv-sequence
#:send
#:send-sequence
#:shutdown
+ #:sockaddr-to-string
#:socket
#:with-accept
#:with-sockaddr-in