[XrdCl] TPC: use separate cgi element to mark user intension to deleg…

…ate. fixes #1118
xrootd · Jan 22, 2020 · f19b432 · f19b432
1 parent 43eb599
commit f19b432
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/XrdCl/XrdClThirdPartyCopyJob.cc b/src/XrdCl/XrdClThirdPartyCopyJob.cc
@@ -438,10 +438,7 @@ namespace XrdCl
     //--------------------------------------------------------------------------
     log->Debug( UtilityMsg, "Generating the destination TPC URL" );
 
-    if( delegate )
-      tpcKey = "delegate";
-    else
-      tpcKey  = GenerateKey();
+    tpcKey  = GenerateKey();
 
     char        *cgiBuff = new char[2048];
     const char  *cgiP    = XrdOucTPC::cgiC2Dst( tpcKey.c_str(),
@@ -450,7 +447,8 @@ namespace XrdCl
                                                 0, cgiBuff, 2048, nbStrm,
                                                 GetSource().GetHostId().c_str(),
                                                 GetSource().GetProtocol().c_str(),
-                                                GetTarget().GetProtocol().c_str() );
+                                                GetTarget().GetProtocol().c_str(),
+                                                delegate );
 
     if( *cgiP == '!' )
     {

diff --git a/src/XrdOuc/XrdOucTPC.cc b/src/XrdOuc/XrdOucTPC.cc
@@ -53,6 +53,7 @@ const char *XrdOucTPC::tpcSpr = "tpc.spr";
 const char *XrdOucTPC::tpcStr = "tpc.str";
 const char *XrdOucTPC::tpcTpr = "tpc.tpr";
 const char *XrdOucTPC::tpcTtl = "tpc.ttl";
+const char *XrdOucTPC::tpcDlgOn = "tpc.dlgon";
 
 /******************************************************************************/
 /*                              c g i C 2 D s t                               */
@@ -63,6 +64,7 @@ const char *XrdOucTPC::cgiC2Dst(const char *cKey, const char *xSrc,
                                       char *Buff, int Blen, int strms,
                                 const char *iHst,
                                 const char *sprt, const char *tprt,
+                                      bool dlgon,
                                       bool  push)
 {
    tpcInfo Info;
@@ -115,6 +117,12 @@ const char *XrdOucTPC::cgiC2Dst(const char *cKey, const char *xSrc,
        if (Blen > 1) n = snprintf(bP, Blen, "&%s=1", tpcPsh);
       }
 
+   // tpc.dlgon
+      {bP += n; Blen -= n;
+       const char* cgistr = dlgon ? "&%s=1" : "&%s=0";
+       if (Blen > 1) n = snprintf(bP, Blen, cgistr, tpcDlgOn);
+      }
+
 
 // All done
 //

diff --git a/src/XrdOuc/XrdOucTPC.hh b/src/XrdOuc/XrdOucTPC.hh
@@ -40,7 +40,7 @@ static
 const char *cgiC2Dst(const char *cKey, const char *xSrc, const char *xLfn,
                      const char *xCks,       char *Buff, int Blen, int strms=0,
                      const char *iHst=0, const char *sprt=0, const char *tprt=0,
-                     bool push=false);
+                     bool dlgon=false, bool push=false);
 
 static
 const char *cgiC2Src(const char *cKey, const char *xDst, int xTTL,
@@ -65,6 +65,7 @@ static const char *tpcSrc;
 static const char *tpcStr;
 static const char *tpcTpr;
 static const char *tpcTtl;
+static const char *tpcDlgOn;
 
             XrdOucTPC() {}
            ~XrdOucTPC() {}