Move address caching logic from AsyncSSLSocket to AsyncSocket.

Summary: So that it is available on other transports.

Reviewed By: Orvid

Differential Revision: D5302039

fbshipit-source-id: cbfdadd158061ed9a2b3ed3e0960ce66f0d545fd

diff --git a/folly/io/async/AsyncSSLSocket.cpp b/folly/io/async/AsyncSSLSocket.cpp
index bb2452e6cbcdce95b9ca1300bcf6053f200ae4c2..e6513f8259db83e1e18890554294e75e459c5d3b 100644 (file)
--- a/folly/io/async/AsyncSSLSocket.cpp
+++ b/folly/io/async/AsyncSSLSocket.cpp
@@ -462,8 +462,8 @@ void AsyncSSLSocket::sslAccept(
 
   // Cache local and remote socket addresses to keep them available
   // after socket file descriptor is closed.
 
   // Cache local and remote socket addresses to keep them available
   // after socket file descriptor is closed.

-  if (cacheAddrOnFailure_ && -1 != getFd()) {
-    cacheLocalPeerAddr();
+  if (cacheAddrOnFailure_) {
+    cacheAddresses();

   }
 
   handshakeStartTime_ = std::chrono::steady_clock::now();
   }
 
   handshakeStartTime_ = std::chrono::steady_clock::now();


@@ -665,19 +665,6 @@ void AsyncSSLSocket::invokeHandshakeCB() {
   }
 }
 
   }
 }
 

-void AsyncSSLSocket::cacheLocalPeerAddr() {
-  SocketAddress address;
-  try {
-    getLocalAddress(&address);
-    getPeerAddress(&address);
-  } catch (const std::system_error& e) {
-    // The handle can be still valid while the connection is already closed.
-    if (e.code() != std::error_code(ENOTCONN, std::system_category())) {
-      throw;
-    }
-  }
-}
-

 void AsyncSSLSocket::connect(
     ConnectCallback* callback,
     const folly::SocketAddress& address,
 void AsyncSSLSocket::connect(
     ConnectCallback* callback,
     const folly::SocketAddress& address,


@@ -755,8 +742,8 @@ void AsyncSSLSocket::sslConn(
 
   // Cache local and remote socket addresses to keep them available
   // after socket file descriptor is closed.
 
   // Cache local and remote socket addresses to keep them available
   // after socket file descriptor is closed.

-  if (cacheAddrOnFailure_ && -1 != getFd()) {
-    cacheLocalPeerAddr();
+  if (cacheAddrOnFailure_) {
+    cacheAddresses();

   }
 
   verifyPeer_ = verifyPeer;
   }
 
   verifyPeer_ = verifyPeer;

diff --git a/folly/io/async/AsyncSSLSocket.h b/folly/io/async/AsyncSSLSocket.h
index 516e07c2bb7c09e9226545c3e9bb02231b8ba3fb..474225c060bfd66ab0bfd86e925c26037ee01ef0 100644 (file)
--- a/folly/io/async/AsyncSSLSocket.h
+++ b/folly/io/async/AsyncSSLSocket.h
@@ -811,8 +811,6 @@ class AsyncSSLSocket : public virtual AsyncSocket {
   void invokeConnectSuccess() override;
   void scheduleConnectTimeout() override;
 
   void invokeConnectSuccess() override;
   void scheduleConnectTimeout() override;
 

-  void cacheLocalPeerAddr();
-

   void startSSLConnect();
 
   static void sslInfoCallback(const SSL *ssl, int type, int val);
   void startSSLConnect();
 
   static void sslInfoCallback(const SSL *ssl, int type, int val);

diff --git a/folly/io/async/AsyncSocket.cpp b/folly/io/async/AsyncSocket.cpp
index 6cd879d9a567843cd556f40b3d8a9009c638535d..f32da3a75ad8e25372cd75854ba222b9c48ff9c4 100644 (file)
--- a/folly/io/async/AsyncSocket.cpp
+++ b/folly/io/async/AsyncSocket.cpp
@@ -1285,17 +1285,39 @@ bool AsyncSocket::isDetachable() const {
   return !ioHandler_.isHandlerRegistered() && !writeTimeout_.isScheduled();
 }
 
   return !ioHandler_.isHandlerRegistered() && !writeTimeout_.isScheduled();
 }
 

-void AsyncSocket::getLocalAddress(folly::SocketAddress* address) const {
+void AsyncSocket::cacheAddresses() {
+  if (fd_ >= 0) {
+    try {
+      cacheLocalAddress();
+      cachePeerAddress();
+    } catch (const std::system_error& e) {
+      if (e.code() != std::error_code(ENOTCONN, std::system_category())) {
+        VLOG(1) << "Error caching addresses: " << e.code().value() << ", "
+                << e.code().message();
+      }
+    }
+  }
+}
+
+void AsyncSocket::cacheLocalAddress() const {

   if (!localAddr_.isInitialized()) {
     localAddr_.setFromLocalAddress(fd_);
   }
   if (!localAddr_.isInitialized()) {
     localAddr_.setFromLocalAddress(fd_);
   }

-  *address = localAddr_;

 }
 
 }
 

-void AsyncSocket::getPeerAddress(folly::SocketAddress* address) const {
+void AsyncSocket::cachePeerAddress() const {

   if (!addr_.isInitialized()) {
     addr_.setFromPeerAddress(fd_);
   }
   if (!addr_.isInitialized()) {
     addr_.setFromPeerAddress(fd_);
   }

+}
+
+void AsyncSocket::getLocalAddress(folly::SocketAddress* address) const {
+  cacheLocalAddress();
+  *address = localAddr_;
+}
+
+void AsyncSocket::getPeerAddress(folly::SocketAddress* address) const {
+  cachePeerAddress();

   *address = addr_;
 }
 
   *address = addr_;
 }
 

diff --git a/folly/io/async/AsyncSocket.h b/folly/io/async/AsyncSocket.h
index 4b0fd0695fc11b5a175ba0deff2261eb75ba9343..6462f115d7a0a52e301195681f212fd65c972377 100644 (file)
--- a/folly/io/async/AsyncSocket.h
+++ b/folly/io/async/AsyncSocket.h
@@ -786,6 +786,13 @@ class AsyncSocket : virtual public AsyncTransportWrapper {
     evbChangeCb_ = std::move(cb);
   }
 
     evbChangeCb_ = std::move(cb);
   }
 

+  /**
+   * Attempt to cache the current local and peer addresses (if not already
+   * cached) so that they are available from getPeerAddress() and
+   * getLocalAddress() even after the socket is closed.
+   */
+  void cacheAddresses();
+

   /**
    * writeReturn is the total number of bytes written, or WRITE_ERROR on error.
    * If no data has been written, 0 is returned.
   /**
    * writeReturn is the total number of bytes written, or WRITE_ERROR on error.
    * If no data has been written, 0 is returned.


@@ -1123,6 +1130,9 @@ class AsyncSocket : virtual public AsyncTransportWrapper {
 
   std::string withAddr(const std::string& s);
 
 
   std::string withAddr(const std::string& s);
 

+  void cacheLocalAddress() const;
+  void cachePeerAddress() const;
+

   StateEnum state_;                      ///< StateEnum describing current state
   uint8_t shutdownFlags_;                ///< Shutdown state (ShutdownFlags)
   uint16_t eventFlags_;                  ///< EventBase::HandlerFlags settings
   StateEnum state_;                      ///< StateEnum describing current state
   uint8_t shutdownFlags_;                ///< Shutdown state (ShutdownFlags)
   uint16_t eventFlags_;                  ///< EventBase::HandlerFlags settings