From e831af35fdbcfe3659be641d736af68f9c520882 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Sun, 17 Sep 2023 14:13:03 +0200
Subject: [PATCH] input/curl: move code to CreateEasy()
---
src/input/plugins/CurlInputPlugin.cxx | 58 +++++++++++++++------------
src/lib/curl/Easy.hxx | 8 ++++
src/lib/curl/Request.hxx | 32 ---------------
3 files changed, 41 insertions(+), 57 deletions(-)
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx
index faac313c6..320f0a7e9 100644
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -455,54 +455,62 @@ CurlInputStream::~CurlInputStream() noexcept
FreeEasyIndirect();
}
-void
-CurlInputStream::InitEasy()
+static CurlEasy
+CreateEasy(const char *url)
{
- request = new CurlRequest(**curl_init, GetURI(), *this);
+ CurlEasy easy{url};
- request->SetOption(CURLOPT_HTTP200ALIASES, http_200_aliases);
- request->SetOption(CURLOPT_FOLLOWLOCATION, 1L);
- request->SetOption(CURLOPT_MAXREDIRS, 5L);
+ easy.SetOption(CURLOPT_HTTP200ALIASES, http_200_aliases);
+ easy.SetOption(CURLOPT_FOLLOWLOCATION, 1L);
+ easy.SetOption(CURLOPT_MAXREDIRS, 5L);
/* this option eliminates the probe request when
username/password are specified */
- request->SetOption(CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+ easy.SetOption(CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
if (proxy != nullptr)
- request->SetOption(CURLOPT_PROXY, proxy);
+ easy.SetOption(CURLOPT_PROXY, proxy);
if (proxy_port > 0)
- request->SetOption(CURLOPT_PROXYPORT, (long)proxy_port);
+ easy.SetOption(CURLOPT_PROXYPORT, (long)proxy_port);
if (proxy_user != nullptr && proxy_password != nullptr)
- request->SetOption(CURLOPT_PROXYUSERPWD,
- FmtBuffer<1024>("{}:{}", proxy_user,
- proxy_password).c_str());
+ easy.SetOption(CURLOPT_PROXYUSERPWD,
+ FmtBuffer<1024>("{}:{}", proxy_user,
+ proxy_password).c_str());
if (cacert != nullptr)
- request->SetOption(CURLOPT_CAINFO, cacert);
- request->SetVerifyPeer(verify_peer);
- request->SetVerifyHost(verify_host);
- request->SetOption(CURLOPT_HTTPHEADER, request_headers.Get());
+ easy.SetOption(CURLOPT_CAINFO, cacert);
+ easy.SetVerifyPeer(verify_peer);
+ easy.SetVerifyHost(verify_host);
try {
- request->SetProxyVerifyPeer(verify_peer);
- request->SetProxyVerifyHost(verify_host);
+ easy.SetProxyVerifyPeer(verify_peer);
+ easy.SetProxyVerifyHost(verify_host);
} catch (...) {
/* these methods fail if libCURL was compiled with
CURL_DISABLE_PROXY; ignore silently */
}
- request->SetConnectTimeout(connect_timeout);
+ easy.SetConnectTimeout(connect_timeout);
- request->SetOption(CURLOPT_VERBOSE, verbose ? 1 : 0);
+ easy.SetOption(CURLOPT_VERBOSE, verbose ? 1 : 0);
- request->SetOption(CURLOPT_LOW_SPEED_LIMIT, low_speed_limit);
- request->SetOption(CURLOPT_LOW_SPEED_TIME, low_speed_time);
+ easy.SetOption(CURLOPT_LOW_SPEED_LIMIT, low_speed_limit);
+ easy.SetOption(CURLOPT_LOW_SPEED_TIME, low_speed_time);
- request->SetOption(CURLOPT_TCP_KEEPALIVE, tcp_keepalive ? 1 : 0);
- request->SetOption(CURLOPT_TCP_KEEPIDLE, tcp_keepidle);
- request->SetOption(CURLOPT_TCP_KEEPINTVL, tcp_keepintvl);
+ easy.SetOption(CURLOPT_TCP_KEEPALIVE, tcp_keepalive ? 1 : 0);
+ easy.SetOption(CURLOPT_TCP_KEEPIDLE, tcp_keepidle);
+ easy.SetOption(CURLOPT_TCP_KEEPINTVL, tcp_keepintvl);
+
+ return easy;
+}
+
+void
+CurlInputStream::InitEasy()
+{
+ request = new CurlRequest(**curl_init, CreateEasy(GetURI()), *this);
+ request->SetRequestHeaders(request_headers.Get());
}
void
diff --git a/src/lib/curl/Easy.hxx b/src/lib/curl/Easy.hxx
index 563c3fa46..5545499b4 100644
--- a/src/lib/curl/Easy.hxx
+++ b/src/lib/curl/Easy.hxx
@@ -125,6 +125,14 @@ public:
SetOption(CURLOPT_SSL_VERIFYPEER, (long)value);
}
+ void SetProxyVerifyHost(bool value) {
+ SetOption(CURLOPT_PROXY_SSL_VERIFYHOST, value ? 2L : 0L);
+ }
+
+ void SetProxyVerifyPeer(bool value) {
+ SetOption(CURLOPT_PROXY_SSL_VERIFYPEER, value);
+ }
+
void SetConnectTimeout(long timeout) {
SetOption(CURLOPT_CONNECTTIMEOUT, timeout);
}
diff --git a/src/lib/curl/Request.hxx b/src/lib/curl/Request.hxx
index 2826a793e..929968acc 100644
--- a/src/lib/curl/Request.hxx
+++ b/src/lib/curl/Request.hxx
@@ -97,38 +97,6 @@ public:
easy.SetRequestHeaders(request_headers);
}
- void SetVerifyHost(bool value) {
- easy.SetVerifyHost(value);
- }
-
- void SetVerifyPeer(bool value) {
- easy.SetVerifyPeer(value);
- }
-
- void SetProxyVerifyHost(bool value) {
- easy.SetOption(CURLOPT_PROXY_SSL_VERIFYHOST, value ? 2L : 0L);
- }
-
- void SetProxyVerifyPeer(bool value) {
- easy.SetOption(CURLOPT_PROXY_SSL_VERIFYPEER, value);
- }
-
- void SetConnectTimeout(long timeout_seconds) {
- easy.SetConnectTimeout(timeout_seconds);
- }
-
- void SetNoBody(bool value=true) {
- easy.SetNoBody(value);
- }
-
- void SetPost(bool value=true) {
- easy.SetPost(value);
- }
-
- void SetRequestBody(const void *data, std::size_t size) {
- easy.SetRequestBody(data, size);
- }
-
void Resume() noexcept;
/**