diff --git a/src/ripple_app/peers/Peer.cpp b/src/ripple_app/peers/Peer.cpp index f5b524bd3..d395b4f82 100644 --- a/src/ripple_app/peers/Peer.cpp +++ b/src/ripple_app/peers/Peer.cpp @@ -2512,7 +2512,7 @@ void PeerImp::addTxSet (uint256 const& hash) // (both sides get the same information, neither side controls it) void PeerImp::getSessionCookie (std::string& strDst) { - SSL* ssl = getHandshakeStream ().native_handle (); + SSL* ssl (getHandshakeStream ().ssl_handle ()); if (!ssl) throw std::runtime_error ("No underlying connection"); diff --git a/src/ripple_net/basics/MultiSocket.h b/src/ripple_net/basics/MultiSocket.h index efa1270f9..99943485f 100644 --- a/src/ripple_net/basics/MultiSocket.h +++ b/src/ripple_net/basics/MultiSocket.h @@ -108,7 +108,8 @@ public: virtual IPAddress remote_endpoint() = 0; virtual ProxyInfo getProxyInfo () = 0; - virtual SSL* native_handle () = 0; + /** Returns a pointer to the SSL handle or nullptr if no SSL. */ + virtual SSL* ssl_handle () = 0; static MultiSocket* New ( boost::asio::io_service& io_service, diff --git a/src/ripple_net/basics/impl/MultiSocketType.h b/src/ripple_net/basics/impl/MultiSocketType.h index af28dd1fe..e91024f11 100644 --- a/src/ripple_net/basics/impl/MultiSocketType.h +++ b/src/ripple_net/basics/impl/MultiSocketType.h @@ -125,9 +125,8 @@ protected: return m_proxyInfo; } - SSL* native_handle () + SSL* ssl_handle () { - bassert (m_native_ssl_handle != nullptr); return m_native_ssl_handle; }