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

Fixed double-locking HTTP bug

Browse source
This commit is contained in:
Thulinma 2016-11-08 15:39:31 +01:00
parent 2aaf6d10f4
commit 84e23f5e5d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/output/output_http.cpp
View file

@ -323,8 +323,6 @@ namespace Mist {
DEBUG_MSG(DLVL_HIGH, "Connector found: %s", connector.c_str()); DEBUG_MSG(DLVL_HIGH, "Connector found: %s", connector.c_str());
//build arguments for starting output process //build arguments for starting output process
std::string temphost=getConnectedHost();
std::string debuglevel = JSON::Value((long long)Util::Config::printDebugLevel).asString();
std::string tmparg = Util::getMyPath() + std::string("MistOut") + connector; std::string tmparg = Util::getMyPath() + std::string("MistOut") + connector;
int argnum = 0; int argnum = 0;
@ -333,6 +331,8 @@ namespace Mist {
JSON::Value pipedCapa = DTSC::Scan(serverCfg.mapped, serverCfg.len).getMember("capabilities").getMember("connectors").getMember(connector).asJSON(); JSON::Value pipedCapa = DTSC::Scan(serverCfg.mapped, serverCfg.len).getMember("capabilities").getMember("connectors").getMember(connector).asJSON();
configLock.post(); configLock.post();
configLock.close(); configLock.close();
std::string temphost=getConnectedHost();
std::string debuglevel = JSON::Value((long long)Util::Config::printDebugLevel).asString();
argarr[argnum++] = (char*)"--ip"; argarr[argnum++] = (char*)"--ip";
argarr[argnum++] = (char*)(temphost.c_str()); argarr[argnum++] = (char*)(temphost.c_str());
argarr[argnum++] = (char*)"--stream"; argarr[argnum++] = (char*)"--stream";
@ -354,7 +354,7 @@ namespace Mist {
std::string host = Output::getConnectedHost(); std::string host = Output::getConnectedHost();
std::string xRealIp = H.GetHeader("X-Real-IP"); std::string xRealIp = H.GetHeader("X-Real-IP");
if (!isTrustedProxy(host) || !xRealIp.size()){ if (!xRealIp.size() || !isTrustedProxy(host)){
static bool msg = false; static bool msg = false;
if (xRealIp.size() && !msg && xRealIp != host){ if (xRealIp.size() && !msg && xRealIp != host){
WARN_MSG("Host %s is attempting to act as a proxy, but not trusted", host.c_str()); WARN_MSG("Host %s is attempting to act as a proxy, but not trusted", host.c_str());
@ -369,7 +369,7 @@ namespace Mist {
std::string host = Output::getConnectedHost(); std::string host = Output::getConnectedHost();
std::string xRealIp = H.GetHeader("X-Real-IP"); std::string xRealIp = H.GetHeader("X-Real-IP");
if (!isTrustedProxy(host) || !xRealIp.size()){ if (!xRealIp.size() || !isTrustedProxy(host)){
static bool msg = false; static bool msg = false;
if (xRealIp.size() && !msg && xRealIp != host){ if (xRealIp.size() && !msg && xRealIp != host){
WARN_MSG("Host %s is attempting to act as a proxy, but not trusted", host.c_str()); WARN_MSG("Host %s is attempting to act as a proxy, but not trusted", host.c_str());