From 4336c3e941da4aba095cc50fefd11ba33aec44f2 Mon Sep 17 00:00:00 2001 From: Connor Gorman Date: Thu, 7 Oct 2021 05:41:07 -0700 Subject: [PATCH] ROX-8160: Remove IPv4 parameter from curl in bootstrap.sh (#475) --- collector/container/scripts/bootstrap.sh | 2 +- collector/lib/GetKernelObject.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/collector/container/scripts/bootstrap.sh b/collector/container/scripts/bootstrap.sh index 81124aa173..c961bf0654 100755 --- a/collector/container/scripts/bootstrap.sh +++ b/collector/container/scripts/bootstrap.sh @@ -60,7 +60,7 @@ function download_kernel_object() { local filename_gz="${OBJECT_PATH}.gz" local curl_opts=( - -sS -4 --retry 30 --retry-connrefused --retry-delay 1 --retry-max-time 60 + -sS --retry 30 --retry-connrefused --retry-delay 1 --retry-max-time 60 --connect-timeout 2 -f -L -w "HTTP Status Code %{http_code}" -o "${filename_gz}" diff --git a/collector/lib/GetKernelObject.cpp b/collector/lib/GetKernelObject.cpp index 828f6013a8..f30c987a65 100644 --- a/collector/lib/GetKernelObject.cpp +++ b/collector/lib/GetKernelObject.cpp @@ -115,7 +115,7 @@ bool DownloadKernelObject(const std::string& hostname, const Json::Value& tls_co return false; } - downloader.IPResolve(FileDownloader::IPv4); + downloader.IPResolve(FileDownloader::ANY); downloader.SetRetries(30, 1, 60); downloader.SetVerboseMode(verbose); downloader.OutputFile(compressed_module_path); @@ -132,7 +132,7 @@ bool DownloadKernelObject(const std::string& hostname, const Json::Value& tls_co } downloader.ResetCURL(); - downloader.IPResolve(FileDownloader::IPv4); + downloader.IPResolve(FileDownloader::ANY); downloader.SetRetries(30, 1, 60); downloader.SetVerboseMode(verbose); downloader.OutputFile(compressed_module_path);