[net] deprecate T*Socket::GetSecContext()

Author: jblomer

net/net/inc/TSocket.h

@@ -41,6 +41,7 @@ namespace ROOT::Deprecated {
 struct TSocketFriend {
    static Bool_t IsAuthenticated(const TSocket &s);
    static void SetSecContext(TSocket &s, TSecContext *ctx);
+   static TSecContext *GetSecContext(const TSocket &s);
 };
 } // namespace ROOT::Deprecated
 
@@ -137,7 +138,9 @@ friend class ROOT::Deprecated::TSocketFriend;
    Int_t                 GetErrorCode() const;
    virtual Int_t         GetOption(ESockOptions opt, Int_t &val);
    Int_t                 GetRemoteProtocol() const { return fRemoteProtocol; }
-   ROOT::Deprecated::TSecContext *GetSecContext() const { return fSecContext; }
+   ROOT::Deprecated::TSecContext *GetSecContext() const
+      R__DEPRECATED(6, 42, "TSocket::GetSecContext is deprecated")
+      { return ROOT::Deprecated::TSocketFriend::GetSecContext(*this); }
    Int_t                 GetTcpWindowSize() const { return fTcpWindowSize; }
    TTimeStamp            GetLastUsage() { R__LOCKGUARD2(fLastUsageMtx); return fLastUsage; }
    const char           *GetUrl() const { return fUrl.Data(); }

net/net/inc/TUDPSocket.h

@@ -110,7 +110,8 @@ friend class TServerSocket;
    Int_t                 GetErrorCode() const;
    virtual Int_t         GetOption(ESockOptions opt, Int_t &val);
    Int_t                 GetRemoteProtocol() const { return fRemoteProtocol; }
-   ROOT::Deprecated::TSecContext *GetSecContext() const { return fSecContext; }
+   ROOT::Deprecated::TSecContext *GetSecContext() const
+      R__DEPRECATED(6, 42, "TUDPSocket::GetSecContext is deprecated") { return fSecContext; }
 
    TTimeStamp            GetLastUsage() { R__LOCKGUARD2(fLastUsageMtx); return fLastUsage; }
    const char           *GetUrl() const { return fUrl; }

net/net/src/TFTP.cxx

@@ -114,7 +114,7 @@ void TFTP::Init(const char *surl, Int_t par, Int_t wsize)
    }
 
    fProtocol = fSocket->GetRemoteProtocol();
-   fUser = fSocket->GetSecContext()->GetUser();
+   fUser = ROOT::Deprecated::TSocketFriend::GetSecContext(*fSocket)->GetUser();
 
    fHost       = url.GetHost();
    fPort       = url.GetPort();
@@ -160,9 +160,10 @@ void TFTP::Print(Option_t *) const
    Printf("Local host:           %s", gSystem->HostName());
    Printf("Remote host:          %s [%d]", fHost.Data(), fPort);
    Printf("Remote user:          %s", fUser.Data());
-   if (ROOT::Deprecated::TSocketFriend::IsAuthenticated(*fSocket))
+   if (ROOT::Deprecated::TSocketFriend::IsAuthenticated(*fSocket)) {
       Printf("Security context:     %s",
-                                      fSocket->GetSecContext()->AsString(secCont));
+             ROOT::Deprecated::TSocketFriend::GetSecContext(*fSocket)->AsString(secCont));
+   }
    Printf("Rootd protocol vers.: %d", fSocket->GetRemoteProtocol());
    if (fParallel > 1) {
       Printf("Parallel sockets:     %d", fParallel);

net/net/src/TNetFile.cxx

@@ -916,8 +916,8 @@ void TNetSystem::Create(const char *url, TSocket *sock)
             fFTP->Close();
             delete fFTP;
          } else {
-            fUser = fFTP->GetSocket()->GetSecContext()->GetUser();
-            fHost = fFTP->GetSocket()->GetSecContext()->GetHost();
+            fUser = ROOT::Deprecated::TSocketFriend::GetSecContext(*fFTP->GetSocket())->GetUser();
+            fHost = ROOT::Deprecated::TSocketFriend::GetSecContext(*fFTP->GetSocket())->GetHost();
             // If responsible for the TFTP connection, remove it from the
             // socket global list to avoid problems with double deletion
             // at final cleanup

net/net/src/TPServerSocket.cxx

@@ -136,8 +136,10 @@ TPSocket *TPServerSocket::Accept(UChar_t Opt)
    }
 
    // Transmit authentication information, if any
-   if (ROOT::Deprecated::TSocketFriend::IsAuthenticated(*setupSocket))
-      ROOT::Deprecated::TSocketFriend::SetSecContext(*newPSocket, setupSocket->GetSecContext());
+   if (ROOT::Deprecated::TSocketFriend::IsAuthenticated(*setupSocket)) {
+      ROOT::Deprecated::TSocketFriend::SetSecContext(*newPSocket,
+                                                     ROOT::Deprecated::TSocketFriend::GetSecContext(*setupSocket));
+   }
 
    // clean up, if needed
    if (size > 0)

net/net/src/TPSocket.cxx

@@ -192,7 +192,7 @@ TPSocket::TPSocket(const char *host, Int_t port, Int_t size, TSocket *sock)
    fBytesSent      = sock->GetBytesSent();
    fBytesRecv      = sock->GetBytesRecv();
    fCompress       = sock->GetCompressionSettings();
-   fSecContext     = sock->GetSecContext();
+   fSecContext     = ROOT::Deprecated::TSocketFriend::GetSecContext(*sock);
    fRemoteProtocol = sock->GetRemoteProtocol();
    fServType       = (TSocket::EServiceType)sock->GetServType();
    fTcpWindowSize  = sock->GetTcpWindowSize();

net/net/src/TSocket.cxx

@@ -46,6 +46,11 @@ void ROOT::Deprecated::TSocketFriend::SetSecContext(TSocket &s, TSecContext *ctx
    s.fSecContext = ctx;
 }
 
+ROOT::Deprecated::TSecContext *ROOT::Deprecated::TSocketFriend::GetSecContext(const TSocket &s)
+{
+   return s.fSecContext;
+}
+
 
 ULong64_t TSocket::fgBytesSent = 0;
 ULong64_t TSocket::fgBytesRecv = 0;