[XrdCl] Use unique_ptr to manage TLS object in socket class.

xrootd · Jun 22, 2020 · f0ee743 · f0ee743
1 parent b2e0d91
commit f0ee743
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 26 deletions.
diff --git a/src/XrdCl/XrdClSocket.cc b/src/XrdCl/XrdClSocket.cc
@@ -40,13 +40,19 @@
 
 namespace XrdCl
 {
+  Socket::Socket( int socket, SocketStatus status ):
+    pSocket(socket), pStatus( status ), pServerAddr( 0 ),
+    pProtocolFamily( AF_INET ),
+    pChannelID( 0 ),
+    pCorked( false )
+  {
+  };
+
   //------------------------------------------------------------------------
   // Desctuctor
   //------------------------------------------------------------------------
   Socket::~Socket()
   {
-    if( pTls ) delete pTls;
-
     Close();
   };
 
@@ -752,7 +758,7 @@ namespace XrdCl
   {
     try
     {
-      if( !pTls ) pTls = new Tls( this, socketHandler );
+      if( !pTls ) pTls.reset( new Tls( this, socketHandler ) );
       return pTls->Connect( thehost, &pServerAddr );
     }
     catch( std::exception& ex )
@@ -765,6 +771,15 @@ namespace XrdCl
     return XRootDStatus();
   }
 
+  //------------------------------------------------------------------------
+  // @return : true if socket is using TLS layer for encryption,
+  //           false otherwise
+  //------------------------------------------------------------------------
+  bool Socket::IsEncrypted()
+  {
+    return bool( pTls.get() );
+  }
+
 }
 
 
diff --git a/src/XrdCl/XrdClSocket.hh b/src/XrdCl/XrdClSocket.hh
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <string>
 #include <sys/socket.h>
+#include <memory>
 
 #include "XrdCl/XrdClXRootDResponses.hh"
 #include "XrdNet/XrdNetAddr.hh"
@@ -55,14 +56,7 @@ namespace XrdCl
       //! @param socket already connected socket if available, -1 otherwise
       //! @param status status of a socket if available
       //------------------------------------------------------------------------
-      Socket( int socket = -1, SocketStatus status = Disconnected ):
-        pSocket(socket), pStatus( status ), pServerAddr( 0 ),
-        pProtocolFamily( AF_INET ),
-        pChannelID( 0 ),
-        pCorked( false ),
-        pTls( 0 )
-      {
-      };
+      Socket( int socket = -1, SocketStatus status = Disconnected );
 
       //------------------------------------------------------------------------
       //! Desctuctor
@@ -281,10 +275,7 @@ namespace XrdCl
       // @return : true if socket is using TLS layer for encryption,
       //           false otherwise
       //------------------------------------------------------------------------
-      inline bool IsEncrypted()
-      {
-        return bool( pTls );
-      }
+      bool IsEncrypted();
 
     protected:
       //------------------------------------------------------------------------
@@ -302,17 +293,17 @@ namespace XrdCl
       XRootDStatus Poll( bool readyForReading, bool readyForWriting,
                          int32_t timeout );
 
-      int                  pSocket;
-      SocketStatus         pStatus;
-      XrdNetAddr           pServerAddr;
-      mutable std::string  pSockName;     // mutable because it's for caching
-      mutable std::string  pPeerName;
-      mutable std::string  pName;
-      int                  pProtocolFamily;
-      AnyObject           *pChannelID;
-      bool                 pCorked;
-
-      Tls                 *pTls;
+      int                   pSocket;
+      SocketStatus          pStatus;
+      XrdNetAddr            pServerAddr;
+      mutable std::string   pSockName;     // mutable because it's for caching
+      mutable std::string   pPeerName;
+      mutable std::string   pName;
+      int                   pProtocolFamily;
+      AnyObject            *pChannelID;
+      bool                  pCorked;
+
+      std::unique_ptr<Tls>  pTls;
   };
 }