hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for telling iOS devices apart by X-Playback-Session-Id and allow IPv6-mapped IPv4 addresses to be properly recognized by the trusted proxy setting.

Browse source
This commit is contained in:
Thulinma 2016-04-19 18:25:10 +02:00
parent 08bab96a6a
commit babbcf706a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/output/output_http.cpp
View file

@ -211,7 +211,7 @@ namespace Mist {
void HTTPOutput::onRequest(){ void HTTPOutput::onRequest(){
while (H.Read(myConn)){ while (H.Read(myConn)){
std::string ua = H.GetHeader("User-Agent"); std::string ua = H.GetHeader("User-Agent") + H.GetHeader("X-Playback-Session-Id");
crc = checksum::crc32(0, ua.data(), ua.size()); crc = checksum::crc32(0, ua.data(), ua.size());
INFO_MSG("Received request %s", H.getUrl().c_str()); INFO_MSG("Received request %s", H.getUrl().c_str());
selectedTracks.clear(); selectedTracks.clear();
@ -393,7 +393,8 @@ namespace Mist {
} }
} }
} }
return trustedProxies.count(ip); //Make sure to also check for IPv6 addresses
return trustedProxies.count(ip) > 0 || trustedProxies.count("::ffff:"+ip) > 0;
} }
/*LTS-END*/ /*LTS-END*/
/*begin-roxlu*/ /*begin-roxlu*/