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

Changes to controller functioning.

Browse source
This commit is contained in:
Thulinma 2015-08-28 21:45:25 +02:00
parent 2817560006
commit 32cdf623b4
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/controller/controller_api.cpp
View file

@ -287,7 +287,6 @@ int Controller::handleAPIConnection(Socket::Connection & conn){
if (Request["addprotocol"].isObject()){ if (Request["addprotocol"].isObject()){
Controller::Storage["config"]["protocols"].append(Request["addprotocol"]); Controller::Storage["config"]["protocols"].append(Request["addprotocol"]);
} }
Controller::CheckProtocols(Controller::Storage["config"]["protocols"], capabilities);
} }
/// ///
/// \api /// \api
@ -327,7 +326,6 @@ int Controller::handleAPIConnection(Socket::Connection & conn){
} }
} }
Controller::Storage["config"]["protocols"] = newProtocols; Controller::Storage["config"]["protocols"] = newProtocols;
Controller::CheckProtocols(Controller::Storage["config"]["protocols"], capabilities);
} }
if (Request["deleteprotocol"].isObject()){ if (Request["deleteprotocol"].isObject()){
JSON::Value newProtocols; JSON::Value newProtocols;
@ -337,7 +335,6 @@ int Controller::handleAPIConnection(Socket::Connection & conn){
} }
} }
Controller::Storage["config"]["protocols"] = newProtocols; Controller::Storage["config"]["protocols"] = newProtocols;
Controller::CheckProtocols(Controller::Storage["config"]["protocols"], capabilities);
} }
} }
/*LTS-END*/ /*LTS-END*/

3
src/controller/controller_uplink.cpp
View file

@ -70,7 +70,6 @@ void Controller::uplinkConnection(void * np) {
if (inScan.hasMember("config")) { if (inScan.hasMember("config")) {
curVal = inScan.getMember("config").asJSON(); curVal = inScan.getMember("config").asJSON();
Controller::checkConfig(curVal, Controller::Storage["config"]); Controller::checkConfig(curVal, Controller::Storage["config"]);
Controller::CheckProtocols(Controller::Storage["config"]["protocols"], capabilities);
} }
if (inScan.hasMember("streams")) { if (inScan.hasMember("streams")) {
curVal = inScan.getMember("streams").asJSON(); curVal = inScan.getMember("streams").asJSON();
@ -79,7 +78,6 @@ void Controller::uplinkConnection(void * np) {
if (inScan.hasMember("addstream")) { if (inScan.hasMember("addstream")) {
curVal = inScan.getMember("addstream").asJSON(); curVal = inScan.getMember("addstream").asJSON();
Controller::AddStreams(curVal, Controller::Storage["streams"]); Controller::AddStreams(curVal, Controller::Storage["streams"]);
Controller::CheckAllStreams(Controller::Storage["streams"]);
} }
if (inScan.hasMember("deletestream")) { if (inScan.hasMember("deletestream")) {
curVal = inScan.getMember("deletestream").asJSON(); curVal = inScan.getMember("deletestream").asJSON();
@ -99,7 +97,6 @@ void Controller::uplinkConnection(void * np) {
Controller::Storage["streams"].removeMember(it->first); Controller::Storage["streams"].removeMember(it->first);
} }
} }
Controller::CheckAllStreams(Controller::Storage["streams"]);
} }
} }
} }