Changeset 35554 in project

Timestamp:

05/27/18 14:35:55 (9 months ago)

Author:

sjamaan

Message:

openssl: Use tcp6 when available

File:

• release/4/openssl/trunk/openssl.scm (modified) (2 diffs)

release/4/openssl/trunk/openssl.scm

@@ -48 +48 @@
    ##sys#check-string))
 
-(use srfi-13 srfi-18 tcp)
+(use srfi-13 srfi-18)
 
 (import
@@ -635 +635 @@
   (listener ssl-unwrap-listener))
 
+;; Import from tcp6 when available, otherwise fall back to the
+;; standard tcp library from CHICKEN core.
+(define-values (tcp-listen tcp-listener-fileno tcp-listener-port
+                           tcp-accept tcp-accept-ready? tcp-close
+                           tcp-abandon-port tcp-buffer-size tcp-connect
+                           tcp-read-timeout tcp-write-timeout)
+  (handle-exceptions
+      exn (eval
+           '(let ()
+              (use tcp)
+              (values tcp-listen tcp-listener-fileno tcp-listener-port
+                      tcp-accept tcp-accept-ready? tcp-close
+                      tcp-abandon-port tcp-buffer-size tcp-connect
+                      tcp-read-timeout tcp-write-timeout)))
+    (eval '(let ()
+             (use tcp6)
+             (values tcp-listen tcp-listener-fileno tcp-listener-port
+                     tcp-accept tcp-accept-ready? tcp-close
+                     tcp-abandon-port tcp-buffer-size tcp-connect
+                     tcp-read-timeout tcp-write-timeout)))))
+
 (define (ssl-listen port #!optional (backlog 4) (hostname #f) (protocol 'sslv2-or-v3))
   (ssl-wrap-listener