trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject [trafficserver] branch master updated: TS-5059: Port TCP Fast Open BIO to OpenSSL 1.1
Date Wed, 18 Jan 2017 00:51:50 GMT
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  742f25c   TS-5059: Port TCP Fast Open BIO to OpenSSL 1.1
742f25c is described below

commit 742f25c556c59fafdcbdf8564e236aceaf5ae1bf
Author: Jack Bates <jack@nottheoilrig.com>
AuthorDate: Mon Jan 2 15:00:13 2017 -0700

    TS-5059: Port TCP Fast Open BIO to OpenSSL 1.1
    
    BIO and BIO_METHOD were made opaque in OpenSSL 1.1 [1].
    
    [1] https://www.openssl.org/news/changelog#x4
---
 iocore/net/BIO_fastopen.cc | 87 +++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 48 deletions(-)

diff --git a/iocore/net/BIO_fastopen.cc b/iocore/net/BIO_fastopen.cc
index d73f696..8280367 100644
--- a/iocore/net/BIO_fastopen.cc
+++ b/iocore/net/BIO_fastopen.cc
@@ -27,16 +27,16 @@
 
 #include "BIO_fastopen.h"
 
-static int
-fastopen_create(BIO *bio)
-{
-  bio->init  = 0;
-  bio->num   = NO_FD;
-  bio->flags = 0;
-  bio->ptr   = nullptr;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define BIO_set_data(a, _ptr) ((a)->ptr = (_ptr))
+#define BIO_get_data(a) ((a)->ptr)
+#define BIO_get_shutdown(a) ((a)->shutdown)
+#define BIO_meth_get_ctrl(biom) ((biom)->ctrl)
+#define BIO_meth_get_create(biom) ((biom)->create)
+#define BIO_meth_get_destroy(biom) ((biom)->destroy)
+#endif
 
-  return 1;
-}
+static int (*fastopen_create)(BIO *) = BIO_meth_get_create(const_cast<BIO_METHOD *>(BIO_s_socket()));
 
 static int
 fastopen_destroy(BIO *bio)
@@ -44,11 +44,10 @@ fastopen_destroy(BIO *bio)
   if (bio) {
     // We expect this BIO to not own the socket, so we must always
     // be in NOCLOSE mode.
-    ink_assert(bio->shutdown == BIO_NOCLOSE);
-    fastopen_create(bio);
+    ink_assert(BIO_get_shutdown(bio) == BIO_NOCLOSE);
   }
 
-  return 1;
+  return BIO_meth_get_destroy(const_cast<BIO_METHOD *>(BIO_s_socket()))(bio);
 }
 
 static int
@@ -58,26 +57,27 @@ fastopen_bwrite(BIO *bio, const char *in, int insz)
 
   errno = 0;
   BIO_clear_retry_flags(bio);
-  ink_assert(bio->num != NO_FD);
+  int fd = BIO_get_fd(bio, nullptr);
+  ink_assert(fd != NO_FD);
 
-  if (bio->ptr) {
+  if (BIO_get_data(bio)) {
     // On the first write only, make a TFO request if TFO is enabled.
     // The best documentation on the behavior of the Linux API is in
     // RFC 7413. If we get EINPROGRESS it means that the SYN has been
     // sent without data and we should retry.
-    const sockaddr *dst = reinterpret_cast<const sockaddr *>(bio->ptr);
+    const sockaddr *dst = reinterpret_cast<const sockaddr *>(BIO_get_data(bio));
     ProxyMutex *mutex   = this_ethread()->mutex.get();
 
     NET_INCREMENT_DYN_STAT(net_fastopen_attempts_stat);
 
-    err = socketManager.sendto(bio->num, (void *)in, insz, MSG_FASTOPEN, dst, ats_ip_size(dst));
+    err = socketManager.sendto(fd, (void *)in, insz, MSG_FASTOPEN, dst, ats_ip_size(dst));
     if (err >= 0) {
       NET_INCREMENT_DYN_STAT(net_fastopen_successes_stat);
     }
 
-    bio->ptr = nullptr;
+    BIO_set_data(bio, nullptr);
   } else {
-    err = socketManager.write(bio->num, (void *)in, insz);
+    err = socketManager.write(fd, (void *)in, insz);
   }
 
   if (err < 0) {
@@ -97,11 +97,12 @@ fastopen_bread(BIO *bio, char *out, int outsz)
 
   errno = 0;
   BIO_clear_retry_flags(bio);
-  ink_assert(bio->num != NO_FD);
+  int fd = BIO_get_fd(bio, nullptr);
+  ink_assert(fd != NO_FD);
 
   // TODO: If we haven't done the fastopen, ink_abort().
 
-  err = socketManager.read(bio->num, out, outsz);
+  err = socketManager.read(fd, out, outsz);
   if (err < 0) {
     errno = -err;
     if (BIO_sock_non_fatal_error(errno)) {
@@ -116,39 +117,18 @@ static long
 fastopen_ctrl(BIO *bio, int cmd, long larg, void *ptr)
 {
   switch (cmd) {
-  case BIO_C_SET_FD:
-    ink_assert(larg == BIO_CLOSE || larg == BIO_NOCLOSE);
-    ink_assert(bio->num == NO_FD);
-
-    bio->init     = 1;
-    bio->shutdown = larg;
-    bio->num      = *reinterpret_cast<int *>(ptr);
-    return 0;
-
   case BIO_C_SET_CONNECT:
     // We only support BIO_set_conn_address(), which sets a sockaddr.
     ink_assert(larg == 2);
-    bio->ptr = ptr;
-    return 0;
-
-  // We are unbuffered so unconditionally succeed on BIO_flush().
-  case BIO_CTRL_FLUSH:
-    return 1;
-
-  case BIO_CTRL_PUSH:
-  case BIO_CTRL_POP:
-    return 0;
-
-  default:
-#if DEBUG
-    ink_abort("unsupported BIO control cmd=%d larg=%ld ptr=%p", cmd, larg, ptr);
-#endif
-
+    BIO_set_data(bio, ptr);
     return 0;
   }
+
+  return BIO_meth_get_ctrl(const_cast<BIO_METHOD *>(BIO_s_socket()))(bio, cmd, larg,
ptr);
 }
 
-static const BIO_METHOD fastopen_methods = {
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+static const BIO_METHOD fastopen_methods[] = {{
   .type          = BIO_TYPE_SOCKET,
   .name          = "fastopen",
   .bwrite        = fastopen_bwrite,
@@ -159,10 +139,21 @@ static const BIO_METHOD fastopen_methods = {
   .create        = fastopen_create,
   .destroy       = fastopen_destroy,
   .callback_ctrl = nullptr,
-};
+}};
+#else
+static const BIO_METHOD *fastopen_methods = [] {
+  BIO_METHOD *fastopen_methods = BIO_meth_new(BIO_TYPE_SOCKET, "fastopen");
+  BIO_meth_set_write(fastopen_methods, fastopen_bwrite);
+  BIO_meth_set_read(fastopen_methods, fastopen_bread);
+  BIO_meth_set_ctrl(fastopen_methods, fastopen_ctrl);
+  BIO_meth_set_create(fastopen_methods, fastopen_create);
+  BIO_meth_set_destroy(fastopen_methods, fastopen_destroy);
+  return fastopen_methods;
+}();
+#endif
 
 const BIO_METHOD *
 BIO_s_fastopen()
 {
-  return &fastopen_methods;
+  return fastopen_methods;
 }

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].

Mime
View raw message