Commit 53650e96 authored by Karl Heyes's avatar Karl Heyes

allow touch frequency setting to be changed on any YP response. Also pass

user agent to YP server

svn path=/icecast/trunk/icecast/; revision=9488
parent e9adc91b
...@@ -128,15 +128,15 @@ static int handle_returned_header (void *ptr, size_t size, size_t nmemb, void *s ...@@ -128,15 +128,15 @@ static int handle_returned_header (void *ptr, size_t size, size_t nmemb, void *s
if (yp->sid) if (yp->sid)
sscanf (ptr, "SID: %[^\r\n]", yp->sid); sscanf (ptr, "SID: %[^\r\n]", yp->sid);
} }
if (strncmp (ptr, "TouchFreq: ", 11) == 0) }
{ if (strncmp (ptr, "TouchFreq: ", 11) == 0)
unsigned secs; {
sscanf (ptr, "TouchFreq: %u", &secs); unsigned secs;
if (secs < 30) sscanf (ptr, "TouchFreq: %u", &secs);
secs = 30; if (secs < 30)
DEBUG1 ("server touch interval is %u", secs); secs = 30;
yp->touch_interval = secs; DEBUG1 ("server touch interval is %u", secs);
} yp->touch_interval = secs;
} }
return (int)bytes; return (int)bytes;
} }
...@@ -240,6 +240,7 @@ void yp_recheck_config (ice_config_t *config) ...@@ -240,6 +240,7 @@ void yp_recheck_config (ice_config_t *config)
} }
if (server->touch_interval < 30) if (server->touch_interval < 30)
server->touch_interval = 30; server->touch_interval = 30;
curl_easy_setopt (server->curl, CURLOPT_USERAGENT, ICECAST_VERSION_STRING);
curl_easy_setopt (server->curl, CURLOPT_URL, server->url); curl_easy_setopt (server->curl, CURLOPT_URL, server->url);
curl_easy_setopt (server->curl, CURLOPT_HEADERFUNCTION, handle_returned_header); curl_easy_setopt (server->curl, CURLOPT_HEADERFUNCTION, handle_returned_header);
curl_easy_setopt (server->curl, CURLOPT_WRITEFUNCTION, handle_returned_data); curl_easy_setopt (server->curl, CURLOPT_WRITEFUNCTION, handle_returned_data);
......
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