X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fsockopt.lisp;h=fb438f1ecfc3689d2d9df77360698c47437baebd;hb=78eea0607fb44f620a8192e173f91860d3622967;hp=88e83b63edf1c07c3f7d100b44066d2645e11cf6;hpb=75b52379bdc2269961af6a1308eca63610f38ac3;p=sbcl.git

diff --git a/contrib/sb-bsd-sockets/sockopt.lisp b/contrib/sb-bsd-sockets/sockopt.lisp
index 88e83b6..fb438f1 100644
--- a/contrib/sb-bsd-sockets/sockopt.lisp
+++ b/contrib/sb-bsd-sockets/sockopt.lisp
@@ -22,7 +22,7 @@ wants to have type (* t).  Note that even for options that have
 integer arguments, this is still a pointer to said integer.
 
 size is the size of the buffer that the return of mangle-arg points
-to, and also of the buffer that we should allocate for getsockopt 
+to, and also of the buffer that we should allocate for getsockopt
 to write into.
 
 mangle-return is called with an alien buffer and should turn it into
@@ -40,53 +40,53 @@ Code for options that not every system has should be conditionalised:
      level number buffer-type mangle-arg mangle-return mangle-setf-buffer
      &optional features info)
   (let ((find-level
-	 (if (numberp (eval level))
-	     level
-	     `(get-protocol-by-name ,(string-downcase (symbol-name level)))))
-	(supportedp (or (null features) (featurep features))))
+         (if (numberp (eval level))
+             level
+             `(get-protocol-by-name ,(string-downcase (symbol-name level)))))
+        (supportedp (or (null features) (sb-int:featurep features))))
     `(progn
       (export ',lisp-name)
       (defun ,lisp-name (socket)
-	,@(when documentation (list (concatenate 'string documentation " " info)))
-	,(if supportedp
-	     `(sb-alien:with-alien ((size sb-alien:integer)
-				      (buffer ,buffer-type))
-		  (setf size (sb-alien:alien-size ,buffer-type :bytes))
-		  (if (= -1 (sockint::getsockopt (socket-file-descriptor socket)
-						 ,find-level ,number
-						 (sb-alien:addr buffer)
-						 (sb-alien:addr size)))
-		      (socket-error "getsockopt")
-		      (,mangle-return buffer size)))
-	     `(error 'unsupported-operator 
-               :format-control "Socket option ~S is not supported in this platform." 
+        ,@(when documentation (list (concatenate 'string documentation " " info)))
+        ,(if supportedp
+             `(sb-alien:with-alien ((size sb-alien:int)
+                                      (buffer ,buffer-type))
+                  (setf size (sb-alien:alien-size ,buffer-type :bytes))
+                  (if (= -1 (sockint::getsockopt (socket-file-descriptor socket)
+                                                 ,find-level ,number
+                                                 (sb-alien:addr buffer)
+                                                 (sb-alien:addr size)))
+                      (socket-error "getsockopt")
+                      (,mangle-return buffer size)))
+             `(error 'unsupported-operator
+               :format-control "Socket option ~S is not supported in this platform."
                :format-arguments (list ',lisp-name))))
       (defun (setf ,lisp-name) (new-val socket)
-	,(if supportedp
-	     `(sb-alien:with-alien ((buffer ,buffer-type))
-		  (setf buffer ,(if mangle-arg
-				    `(,mangle-arg new-val)
-				    `new-val))
-		  (when (= -1 (sockint::setsockopt (socket-file-descriptor socket)
-						   ,find-level ,number
-						   (,mangle-setf-buffer buffer)
-						   ,(if (eql buffer-type 'sb-alien:c-string)
-							`(length new-val)
-							`(sb-alien:alien-size ,buffer-type :bytes))))
-		    (socket-error "setsockopt")))
-	     `(error 'unsupported-operator 
+        ,(if supportedp
+             `(sb-alien:with-alien ((buffer ,buffer-type))
+                  (setf buffer ,(if mangle-arg
+                                    `(,mangle-arg new-val)
+                                    `new-val))
+                  (when (= -1 (sockint::setsockopt (socket-file-descriptor socket)
+                                                   ,find-level ,number
+                                                   (,mangle-setf-buffer buffer)
+                                                   ,(if (eql buffer-type 'sb-alien:c-string)
+                                                        `(length new-val)
+                                                        `(sb-alien:alien-size ,buffer-type :bytes))))
+                    (socket-error "setsockopt")))
+             `(error 'unsupported-operator
                :format-control "Socket option ~S is not supported on this platform."
                :format-arguments (list ',lisp-name)))))))
 
 ;;; sockopts that have integer arguments
 
 (defun foreign-int-to-integer (buffer size)
-  (assert (= size (sb-alien:alien-size sb-alien:integer :bytes)))
+  (assert (= size (sb-alien:alien-size sb-alien:int :bytes)))
   buffer)
 
 (defmacro define-socket-option-int (name level number &optional features (info ""))
   `(define-socket-option ,name nil ,level ,number
-     sb-alien:integer nil foreign-int-to-integer sb-alien:addr ,features ,info))
+     sb-alien:int nil foreign-int-to-integer sb-alien:addr ,features ,info))
 
 (define-socket-option-int
   sockopt-receive-low-water sockint::sol-socket sockint::so-rcvlowat)
@@ -102,6 +102,13 @@ Code for options that not every system has should be conditionalised:
   sockopt-priority sockint::sol-socket sockint::so-priority :linux
   "Available only on Linux.")
 
+(define-socket-option-int
+  sockopt-tcp-keepcnt :tcp sockint::tcp-keepcnt :linux "Available only on Linux.")
+(define-socket-option-int
+  sockopt-tcp-keepidle :tcp sockint::tcp-keepidle :linux "Available only on Linux.")
+(define-socket-option-int
+  sockopt-tcp-keepintvl :tcp sockint::tcp-keepintvl :linux "Available only on Linux.")
+
 ;;; boolean options are integers really
 
 (defun foreign-int-to-bool (x size)
@@ -116,9 +123,9 @@ Code for options that not every system has should be conditionalised:
   `(define-socket-option ,name
     ,(format nil "~@<Return the value of the ~A socket option for SOCKET. ~
                  This can also be updated with SETF.~:@>"
-	     (symbol-name c-name))
+             (symbol-name c-name))
     ,level ,c-name
-    sb-alien:integer bool-to-foreign-int foreign-int-to-bool sb-alien:addr
+    sb-alien:int bool-to-foreign-int foreign-int-to-bool sb-alien:addr
     ,features ,info))
 
 (define-socket-option-bool