oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input_curl: honour http_proxy_* config directives

Browse Source 
If http_proxy_{host, port, user, password} are provided in mpd.conf
they are not passed on to libcurl. As a result mpd cannot stream from
behind an http proxy.

The attached patch `http_proxy.patch` makes the relevant calls to
curl_easy_setopt(...) for all proxy configuration parameters, but is
only tested for host and port.
This commit is contained in:
Joe Milbourn 2009-01-13 22:57:05 +01:00 committed by Max Kellermann
parent 18cb34700e
commit 45598d50e3
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -14,6 +14,7 @@ ver 0.15 - (200?/??/??)
* added Icy-Metadata support * added Icy-Metadata support
* fix cross-fading bug: it used to play some chunks of the new song twice * fix cross-fading bug: it used to play some chunks of the new song twice
* --create-db starts the MPD daemon instead of exiting * --create-db starts the MPD daemon instead of exiting
* input_curl: honour http_proxy_* config directives
ver 0.14 (2008/12/25) ver 0.14 (2008/12/25)
* audio outputs: * audio outputs:

30
src/input_curl.c
View File

@ -18,6 +18,7 @@
#include "input_curl.h" #include "input_curl.h"
#include "input_stream.h" #include "input_stream.h"
#include "conf.h"
#include "config.h" #include "config.h"
#include "tag.h" #include "tag.h"
#include "icy_metadata.h" #include "icy_metadata.h"
@ -619,6 +620,10 @@ input_curl_easy_init(struct input_stream *is)
struct input_curl *c = is->data; struct input_curl *c = is->data;
CURLcode code; CURLcode code;
CURLMcode mcode; CURLMcode mcode;
ConfigParam *proxy_host;
ConfigParam *proxy_port;
ConfigParam *proxy_user;
ConfigParam *proxy_pass;
c->eof = false; c->eof = false;
@ -646,6 +651,31 @@ input_curl_easy_init(struct input_stream *is)
curl_easy_setopt(c->easy, CURLOPT_FAILONERROR, true); curl_easy_setopt(c->easy, CURLOPT_FAILONERROR, true);
curl_easy_setopt(c->easy, CURLOPT_ERRORBUFFER, c->error); curl_easy_setopt(c->easy, CURLOPT_ERRORBUFFER, c->error);
proxy_host = getConfigParam(CONF_HTTP_PROXY_HOST);
proxy_port = getConfigParam(CONF_HTTP_PROXY_PORT);
proxy_user = getConfigParam(CONF_HTTP_PROXY_USER);
proxy_pass = getConfigParam(CONF_HTTP_PROXY_PASSWORD);
if (proxy_host != NULL) {
char *proxy_host_str;
if (proxy_port == NULL) {
proxy_host_str = g_strdup(proxy_host->value);
} else {
proxy_host_str =
g_strconcat(proxy_host->value, ":", proxy_port->value, NULL);
}
curl_easy_setopt(c->easy, CURLOPT_PROXY, proxy_host_str);
g_free(proxy_host_str);
}
if ((proxy_user != NULL) && (proxy_pass != NULL)) {
char *proxy_auth_str =
g_strconcat(proxy_user->value, ":", proxy_pass->value, NULL);
curl_easy_setopt(c->easy, CURLOPT_PROXYUSERPWD, proxy_auth_str);
g_free(proxy_auth_str);
}
code = curl_easy_setopt(c->easy, CURLOPT_URL, c->url); code = curl_easy_setopt(c->easy, CURLOPT_URL, c->url);
if (code != CURLE_OK) if (code != CURLE_OK)
return false; return false;