[XrdCl] Introduce StreamQuery::HostName.

xrootd · Jun 3, 2022 · 18210b0 · 18210b0
1 parent cc064c6
commit 18210b0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/src/XrdCl/XrdClAsyncSocketHandler.cc b/src/XrdCl/XrdClAsyncSocketHandler.cc
@@ -846,12 +846,23 @@ namespace XrdCl
   }
 
   //------------------------------------------------------------------------
-  // Get hostname
+  // Get IP address
   //------------------------------------------------------------------------
   std::string AsyncSocketHandler::GetIpAddr()
   {
     char nameBuff[256];
-    pSockAddr.Format( nameBuff, sizeof(nameBuff), XrdNetAddrInfo::fmtAuto, XrdNetAddrInfo::noPort );
+    pSockAddr.Format( nameBuff, sizeof(nameBuff), XrdNetAddrInfo::fmtAddr, XrdNetAddrInfo::noPort );
     return nameBuff;
   }
+
+  //------------------------------------------------------------------------
+  //! Get hostname
+  //------------------------------------------------------------------------
+  std::string AsyncSocketHandler::GetHostName()
+  {
+    const char *cstr = pSockAddr.Name();
+    if( !cstr )
+      return std::string();
+    return cstr;
+  }
 }
diff --git a/src/XrdCl/XrdClAsyncSocketHandler.hh b/src/XrdCl/XrdClAsyncSocketHandler.hh
@@ -130,10 +130,15 @@ namespace XrdCl
       std::string GetIpStack() const;
 
       //------------------------------------------------------------------------
-      //! Get hostname
+      //! Get IP address
       //------------------------------------------------------------------------
       std::string GetIpAddr();
 
+      //------------------------------------------------------------------------
+      //! Get hostname
+      //------------------------------------------------------------------------
+      std::string GetHostName();
+
     protected:
 
       //------------------------------------------------------------------------

diff --git a/src/XrdCl/XrdClPostMasterInterfaces.hh b/src/XrdCl/XrdClPostMasterInterfaces.hh
@@ -301,6 +301,7 @@ namespace XrdCl
   {
       static const uint16_t IpAddr   = 2001;
       static const uint16_t IpStack  = 2002;
+      static const uint16_t HostName = 2003;
   };
 
   //----------------------------------------------------------------------------

diff --git a/src/XrdCl/XrdClStream.cc b/src/XrdCl/XrdClStream.cc
@@ -1196,6 +1196,12 @@ namespace XrdCl
         return Status();
       }
 
+      case StreamQuery::HostName:
+      {
+        result.Set( new std::string( pSubStreams[0]->socket->GetHostName() ), false );
+        return Status();
+      }
+
       default:
         return Status( stError, errQueryNotSupported );
     }