[XrdTls] Use pimpl idiom in XrdTlsSocket

xrootd · Oct 16, 2019 · feafb9c · feafb9c
1 parent 6c6f047
commit feafb9c
Show file tree

Hide file tree

Showing 7 changed files with 177 additions and 122 deletions.
diff --git a/src/Xrd/XrdLinkXeq.cc b/src/Xrd/XrdLinkXeq.cc
@@ -770,8 +770,8 @@ XrdProtocol *XrdLinkXeq::setProtocol(XrdProtocol *pp, bool push)
 bool XrdLinkXeq::setTLS(bool enable)
 { //???
 // static const XrdTlsConnection::RW_Mode rwMode=XrdTlsConnection::TLS_RNB_WBL;
-   static const XrdTlsConnection::RW_Mode rwMode=XrdTlsConnection::TLS_RBL_WBL;
-   static const XrdTlsConnection::HS_Mode hsMode=XrdTlsConnection::TLS_HS_BLOCK;
+   static const XrdTlsSocket::RW_Mode rwMode=XrdTlsSocket::TLS_RBL_WBL;
+   static const XrdTlsSocket::HS_Mode hsMode=XrdTlsSocket::TLS_HS_BLOCK;
    const char *eNote;
    int rc;
 

diff --git a/src/Xrd/XrdLinkXeq.hh b/src/Xrd/XrdLinkXeq.hh
@@ -33,13 +33,13 @@
 #include <fcntl.h>
 #include <time.h>
 
+#include "../XrdTls/XrdTlsSocket.hh"
 #include "Xrd/XrdLink.hh"
 #include "Xrd/XrdPollInfo.hh"
 #include "Xrd/XrdProtocol.hh"
 
 #include "XrdNet/XrdNetAddr.hh"
 
-#include "XrdTls/XrdTlsConnection.hh"
 
 /******************************************************************************/
 /*                      C l a s s   D e f i n i t i o n                       */
@@ -171,7 +171,7 @@ XrdProtocol   *ProtoAlt;             // -> Alternate/stacked protocol
 
 // TLS section
 //
-XrdTlsConnection    tlsIO;
+XrdTlsSocket    tlsIO;
 
 // Identification section
 //

diff --git a/src/XrdCl/XrdClTls.cc b/src/XrdCl/XrdClTls.cc
@@ -22,8 +22,8 @@ namespace XrdCl
 {
 
   Tls::Tls( XrdTlsContext &ctx, int sfd ) 
-      : io( ctx, sfd, XrdTlsConnection::TLS_RNB_WNB,
-                      XrdTlsConnection::TLS_HS_NOBLK, true )
+      : io( ctx, sfd, XrdTlsSocket::TLS_RNB_WNB,
+                      XrdTlsSocket::TLS_HS_NOBLK, true )
   {
 
   }

diff --git a/src/XrdCl/XrdClTls.hh b/src/XrdCl/XrdClTls.hh
@@ -22,8 +22,8 @@
 #include <openssl/bio.h>
 #include <openssl/ssl.h>
 
+#include "../XrdTls/XrdTlsSocket.hh"
 #include "XrdCl/XrdClStatus.hh"
-#include "XrdTls/XrdTlsConnection.hh"
 
 class XrdTlsContext;
 
@@ -77,7 +77,7 @@ namespace XrdCl
       //------------------------------------------------------------------------
       //! The TSL I/O wrapper
       //------------------------------------------------------------------------
-      XrdTlsConnection io;
+      XrdTlsSocket io;
   };
 
   //----------------------------------------------------------------------------