Skip to content

M
mpd
Commit 8b838ff9 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

input/curl: use CURLOPT_PRIVATE

Replaces the loop in input_curl_find_request().
parent 154bdf0b
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
src/input/CurlInputPlugin.cxx
View file @ 8b838ff9
...@@ -224,16 +224,18 @@ static constexpr Domain curlm_domain("curlm"); ...@@ -224,16 +224,18 @@ static constexpr Domain curlm_domain("curlm");
* *
* Runs in the I/O thread. No lock needed. * Runs in the I/O thread. No lock needed.
*/ */
gcc_pure
static struct input_curl * static struct input_curl *
input_curl_find_request(CURL *easy) input_curl_find_request(CURL *easy)
{ {
assert(io_thread_inside()); assert(io_thread_inside());
for (auto c : curl.requests) void *p;
if (c->easy == easy) CURLcode code = curl_easy_getinfo(easy, CURLINFO_PRIVATE, &p);
return c; if (code != CURLE_OK)
return nullptr;
return nullptr; return (input_curl *)p;
} }
static void static void
...@@ -326,7 +328,6 @@ input_curl_easy_add(struct input_curl *c, Error &error) ...@@ -326,7 +328,6 @@ input_curl_easy_add(struct input_curl *c, Error &error)
assert(io_thread_inside()); assert(io_thread_inside());
assert(c != nullptr); assert(c != nullptr);
assert(c->easy != nullptr); assert(c->easy != nullptr);
assert(input_curl_find_request(c->easy) == nullptr);
curl.requests.push_front(c); curl.requests.push_front(c);
...@@ -927,6 +928,7 @@ input_curl_easy_init(struct input_curl *c, Error &error) ...@@ -927,6 +928,7 @@ input_curl_easy_init(struct input_curl *c, Error &error)
return false; return false;
} }
curl_easy_setopt(c->easy, CURLOPT_PRIVATE, (void *)c);
curl_easy_setopt(c->easy, CURLOPT_USERAGENT, curl_easy_setopt(c->easy, CURLOPT_USERAGENT,
"Music Player Daemon " VERSION); "Music Player Daemon " VERSION);
curl_easy_setopt(c->easy, CURLOPT_HEADERFUNCTION, curl_easy_setopt(c->easy, CURLOPT_HEADERFUNCTION,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment