From b4ea336c938590ef0b69e8977e4eb1c2628bad4a Mon Sep 17 00:00:00 2001 From: Andrea Manzi <amanzi@cern.ch> Date: Fri, 22 Feb 2019 10:38:03 +0100 Subject: [PATCH 1/4] FTS-1381: fix for rawhide --- src/server/services/transfers/UrlCopyCmd.cpp | 8 ++++++-- src/server/services/transfers/UrlCopyCmd.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/server/services/transfers/UrlCopyCmd.cpp b/src/server/services/transfers/UrlCopyCmd.cpp index 8ff2a7c15..6816b6654 100644 --- a/src/server/services/transfers/UrlCopyCmd.cpp +++ b/src/server/services/transfers/UrlCopyCmd.cpp @@ -122,9 +122,13 @@ void UrlCopyCmd::setProxy(const std::string &path) } -void UrlCopyCmd::setUDT(bool set) +void UrlCopyCmd::setUDT(boost::tribool set) { - setFlag("udt", set); + if (boost::indeterminate(set)) { + setFlag("udt", false); + } else { + setFlag("udt", set); + } } diff --git a/src/server/services/transfers/UrlCopyCmd.h b/src/server/services/transfers/UrlCopyCmd.h index 00e110ade..9624b498f 100644 --- a/src/server/services/transfers/UrlCopyCmd.h +++ b/src/server/services/transfers/UrlCopyCmd.h @@ -61,7 +61,7 @@ public: void setOptimizerLevel(int); void setDebugLevel(int); void setProxy(const std::string&); - void setUDT(bool); + void setUDT(boost::tribool); void setIPv6(boost::tribool); bool isIPv6Explicit(void); void setFTSName(const std::string&); -- GitLab From e0b3c9331838951bd046a9e1d02dc030dcfa6425 Mon Sep 17 00:00:00 2001 From: Andrea Manzi <amanzi@cern.ch> Date: Fri, 22 Feb 2019 10:56:02 +0100 Subject: [PATCH 2/4] FTS-1381: fix for rawhide --- src/server/services/transfers/UrlCopyCmd.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/server/services/transfers/UrlCopyCmd.cpp b/src/server/services/transfers/UrlCopyCmd.cpp index 6816b6654..bc77bf8d2 100644 --- a/src/server/services/transfers/UrlCopyCmd.cpp +++ b/src/server/services/transfers/UrlCopyCmd.cpp @@ -127,7 +127,8 @@ void UrlCopyCmd::setUDT(boost::tribool set) if (boost::indeterminate(set)) { setFlag("udt", false); } else { - setFlag("udt", set); + bool value = set; + setFlag("udt", value); } } @@ -140,9 +141,10 @@ void UrlCopyCmd::setIPv6(boost::tribool set) setFlag("ipv4", false); } else { + bool value = set; IPv6Explicit = true; - setFlag("ipv6", set); - setFlag("ipv4", !set); + setFlag("ipv6", value); + setFlag("ipv4", !value); } } -- GitLab From bad2bb16f8a2512b4f6d54cba3d46dc1d8107355 Mon Sep 17 00:00:00 2001 From: Andrea Manzi <amanzi@cern.ch> Date: Fri, 22 Feb 2019 11:21:02 +0100 Subject: [PATCH 3/4] FTS-1381: fix for rawhide --- src/server/services/transfers/UrlCopyCmd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/services/transfers/UrlCopyCmd.cpp b/src/server/services/transfers/UrlCopyCmd.cpp index bc77bf8d2..09774c587 100644 --- a/src/server/services/transfers/UrlCopyCmd.cpp +++ b/src/server/services/transfers/UrlCopyCmd.cpp @@ -127,7 +127,7 @@ void UrlCopyCmd::setUDT(boost::tribool set) if (boost::indeterminate(set)) { setFlag("udt", false); } else { - bool value = set; + bool value = (set.value == true); setFlag("udt", value); } } @@ -141,7 +141,7 @@ void UrlCopyCmd::setIPv6(boost::tribool set) setFlag("ipv4", false); } else { - bool value = set; + bool value = (set.value == true); IPv6Explicit = true; setFlag("ipv6", value); setFlag("ipv4", !value); -- GitLab From ccf78b43e7e215bcaee33a658046de97e29966a2 Mon Sep 17 00:00:00 2001 From: Andrea Manzi <amanzi@cern.ch> Date: Fri, 22 Feb 2019 13:23:44 +0100 Subject: [PATCH 4/4] fix test --- test/unit/db/SeConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/db/SeConfig.cpp b/test/unit/db/SeConfig.cpp index 1c171874c..6f00bda0e 100644 --- a/test/unit/db/SeConfig.cpp +++ b/test/unit/db/SeConfig.cpp @@ -34,7 +34,7 @@ BOOST_AUTO_TEST_CASE (SeConfigMerge) BOOST_CHECK_EQUAL(60, target.inboundMaxActive); BOOST_CHECK_EQUAL(100, target.outboundMaxActive); - BOOST_CHECK_EQUAL(true, target.udt); + BOOST_CHECK_EQUAL(true, target.udt.value); BOOST_CHECK(boost::indeterminate(target.ipv6)); } -- GitLab