[XrdCl] Socket: lazy initialize srv addr.

xrootd · Jan 26, 2021 · 3c64ccb · 3c64ccb
1 parent beecc2c
commit 3c64ccb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/src/XrdCl/XrdClAsyncSocketHandler.cc b/src/XrdCl/XrdClAsyncSocketHandler.cc
@@ -344,7 +344,7 @@ namespace XrdCl
     //--------------------------------------------------------------------------
     pHandShakeData = new HandShakeData( pStream->GetURL(),
                                         pSubStreamNum );
-    pHandShakeData->serverAddr = &pSocket->GetServerAddress();
+    pHandShakeData->serverAddr = pSocket->GetServerAddress();
     pHandShakeData->clientName = pSocket->GetSockName();
     pHandShakeData->streamName = pStreamName;
 

diff --git a/src/XrdCl/XrdClSocket.cc b/src/XrdCl/XrdClSocket.cc
@@ -42,7 +42,7 @@
 namespace XrdCl
 {
   Socket::Socket( int socket, SocketStatus status ):
-    pSocket(socket), pStatus( status ), pServerAddr( 0 ),
+    pSocket(socket), pStatus( status ),
     pProtocolFamily( AF_INET ),
     pChannelID( 0 ),
     pCorked( false )
@@ -215,7 +215,7 @@ namespace XrdCl
     if( pSocket == -1 || pStatus == Connected || pStatus == Connecting )
       return XRootDStatus( stError, errInvalidOp );
 
-    pServerAddr = addr;
+    pServerAddr.reset( new XrdNetAddr( addr ) );;
 
     //--------------------------------------------------------------------------
     // Make sure TLS is off when the physical connection is newly established
@@ -225,8 +225,8 @@ namespace XrdCl
     //--------------------------------------------------------------------------
     // Connect
     //--------------------------------------------------------------------------
-    int status = XrdNetConnect::Connect( pSocket, pServerAddr.SockAddr(),
-                                         pServerAddr.SockSize(), timeout );
+    int status = XrdNetConnect::Connect( pSocket, pServerAddr->SockAddr(),
+                                         pServerAddr->SockSize(), timeout );
     if( status != 0 )
     {
       XRootDStatus st( stError );
@@ -778,12 +778,13 @@ namespace XrdCl
   // Enable encryption
   //------------------------------------------------------------------------
   XRootDStatus Socket::TlsHandShake( AsyncSocketHandler *socketHandler,
-                                   const std::string  &thehost )
+                                     const std::string  &thehost )
   {
     try
     {
+      if( !pServerAddr ) return XRootDStatus( stError, errInvalidOp );
       if( !pTls ) pTls.reset( new Tls( this, socketHandler ) );
-      return pTls->Connect( thehost, &pServerAddr );
+      return pTls->Connect( thehost, pServerAddr.get() );
     }
     catch( std::exception& ex )
     {

diff --git a/src/XrdCl/XrdClSocket.hh b/src/XrdCl/XrdClSocket.hh
@@ -212,9 +212,9 @@ namespace XrdCl
       //------------------------------------------------------------------------
       //! Get the server address
       //------------------------------------------------------------------------
-      const XrdNetAddr &GetServerAddress() const
+      const XrdNetAddr* GetServerAddress() const
       {
-        return pServerAddr;
+        return pServerAddr.get();
       }
 
       //------------------------------------------------------------------------
@@ -302,17 +302,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;
-
-      std::unique_ptr<Tls>  pTls;
+      int                          pSocket;
+      SocketStatus                 pStatus;
+      std::unique_ptr<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;
   };
 }