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

Fixed indenting in conn_http.cpp; added proper support for debug levels to HTTP proxy.

Browse source
This commit is contained in:
Thulinma 2014-07-22 12:03:55 +02:00
parent 0dc2a6155a
commit 27bc1995e7
1 changed files with 31 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/connectors/conn_http.cpp
View file

@ -487,62 +487,57 @@ namespace Connector_HTTP {
int fdIn = conn.getSocket(); int fdIn = conn.getSocket();
int fdOut = conn.getSocket(); int fdOut = conn.getSocket();
//taken from CheckProtocols (controller_connectors.cpp) //taken from CheckProtocols (controller_connectors.cpp)
char * argarr[20]; char * argarr[20];
for (int i=0; i<20; i++){argarr[i] = 0;} for (int i=0; i<20; i++){argarr[i] = 0;}
int id = -1; int id = -1;
for (unsigned int i=0; i < ServConf["config"]["protocols"].size(); ++i){
if ( ServConf["config"]["protocols"][i]["connector"].asStringRef() == connector ) {
id = i;
break; //pick the first protocol in the list that matches the connector
}
}
if (id == -1) {
DEBUG_MSG(DLVL_ERROR, "No connector found for: %s", connector.c_str());
return -1;
}
DEBUG_MSG(DLVL_HIGH, "Connector found: %s", connector.c_str()); for (unsigned int i=0; i < ServConf["config"]["protocols"].size(); ++i){
if ( ServConf["config"]["protocols"][i]["connector"].asStringRef() == connector ) {
id = i;
break; //pick the first protocol in the list that matches the connector
}
}
if (id == -1) {
DEBUG_MSG(DLVL_ERROR, "No connector found for: %s", connector.c_str());
return -1;
}
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=conn.getHost(); std::string temphost=conn.getHost();
std::string tempstream=H.GetVar("stream"); std::string tempstream=H.GetVar("stream");
// buildPipedArguments( , (char **)&argarr, Connector_HTTP::capabilities, temphost, tempstream); std::string debuglevel = JSON::Value((long long)Util::Config::printDebugLevel).asString();
int argnum = 0;
std::string tmparg; std::string tmparg;
tmparg = Util::getMyPath() + std::string("MistOut") + ServConf["config"]["protocols"][id]["connector"].asStringRef(); tmparg = Util::getMyPath() + std::string("MistOut") + ServConf["config"]["protocols"][id]["connector"].asStringRef();
struct stat buf; struct stat buf;
if (::stat(tmparg.c_str(), &buf) != 0){ if (::stat(tmparg.c_str(), &buf) != 0){
tmparg = Util::getMyPath() + std::string("MistConn") + ServConf["config"]["protocols"][id]["connector"].asStringRef(); tmparg = Util::getMyPath() + std::string("MistConn") + ServConf["config"]["protocols"][id]["connector"].asStringRef();
} }
int argnum = 0;
argarr[argnum++] = (char*)tmparg.c_str(); argarr[argnum++] = (char*)tmparg.c_str();
JSON::Value & p = ServConf["config"]["protocols"][id]; JSON::Value & p = ServConf["config"]["protocols"][id];
JSON::Value & pipedCapa = capabilities[p["connector"].asStringRef()]; JSON::Value & pipedCapa = capabilities[p["connector"].asStringRef()];
/// \todo why is the if(pipedCapa) line not working (nothing is added to argarr)??
if (pipedCapa.isMember("required")){builPipedPart(p, argarr, argnum, pipedCapa["required"]);}
if (pipedCapa.isMember("optional")){builPipedPart(p, argarr, argnum, pipedCapa["optional"]);}
argarr[argnum++] = (char*)"-i"; argarr[argnum++] = (char*)"-i";
argarr[argnum++] = (char*)(temphost.c_str()); argarr[argnum++] = (char*)(temphost.c_str());
argarr[argnum++] = (char*)"-s"; argarr[argnum++] = (char*)"-s";
argarr[argnum++] = (char*)(tempstream.c_str()); argarr[argnum++] = (char*)(tempstream.c_str());
//set the debug level if non-default
//for (unsigned int i=0; i<20; i++){ if (Util::Config::printDebugLevel != DEBUG){
//std::cerr << "argv["<<i<< "] " << argarr[i] <<std::endl; argarr[argnum++] = (char*)"--debug";
//} argarr[argnum++] = (char*)(debuglevel.c_str());
}
//std::cerr << "p: " << p.toPrettyString() <<std::endl; if (pipedCapa.isMember("required")){builPipedPart(p, argarr, argnum, pipedCapa["required"]);}
//std::cerr << "pipedCapa: " << pipedCapa.toPrettyString() <<std::endl; if (pipedCapa.isMember("optional")){builPipedPart(p, argarr, argnum, pipedCapa["optional"]);}
//std::cerr << "capa: " << capabilities.toPrettyString() <<std::endl;
int tempint = fileno(stderr);
int tempint = fileno(stderr);
///start output process, fdIn and fdOut are connected to conn.sock ///start output process, fdIn and fdOut are connected to conn.sock
Util::Procs::StartPiped(argarr, & fdIn, & fdOut, & tempint); Util::Procs::StartPiped(argarr, & fdIn, & fdOut, & tempint);
conn.drop(); conn.drop();
return 0; return 0;
} }
///\brief Determines the type of connector to be used for handling a request. ///\brief Determines the type of connector to be used for handling a request.