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

Added no_unconfigured_streams API call, which nukes streams that are not supposed to be running.

Browse source
This commit is contained in:
Thulinma 2020-11-29 01:59:23 +01:00
parent 570ed76bd2
commit 49aa497a66
1 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/controller/controller_api.cpp
View file

@ -485,6 +485,18 @@ static void removeDuplicateProtocols(){
} }
} }
/// Helper function for nuke_stream and related calls
static void nukeStream(const std::string & strm){
std::deque<std::string> command;
command.push_back(Util::getMyPath() + "MistUtilNuke");
command.push_back(strm);
int stdIn = 0;
int stdOut = 1;
int stdErr = 2;
Util::Procs::StartPiped(command, &stdIn, &stdOut, &stdErr);
}
void Controller::handleAPICommands(JSON::Value &Request, JSON::Value &Response){ void Controller::handleAPICommands(JSON::Value &Request, JSON::Value &Response){
/*LTS-START*/ /*LTS-START*/
// These are only used internally. We abort further processing if encountered. // These are only used internally. We abort further processing if encountered.
@ -964,14 +976,37 @@ void Controller::handleAPICommands(JSON::Value &Request, JSON::Value &Response){
} }
if (Request.isMember("nuke_stream") && Request["nuke_stream"].isString() && Request["nuke_stream"].asStringRef().size()){ if (Request.isMember("nuke_stream") && Request["nuke_stream"].isString() && Request["nuke_stream"].asStringRef().size()){
std::string strm = Request["nuke_stream"].asStringRef(); nukeStream(Request["nuke_stream"].asStringRef());
std::deque<std::string> command; }
command.push_back(Util::getMyPath() + "MistUtilNuke");
command.push_back(strm); if (Request.isMember("no_unconfigured_streams")){
int stdIn = 0; JSON::Value emptyRequest;
int stdOut = 1; JSON::Value currStreams;
int stdErr = 2; Controller::fillActive(emptyRequest, currStreams, true);
Util::Procs::StartPiped(command, &stdIn, &stdOut, &stdErr); jsonForEach(currStreams, strm){
std::string S = strm->asStringRef();
//Remove wildcard, if any
if (S.find('+') != std::string::npos){S.erase(S.find('+'));}
if (!Controller::Storage["streams"].isMember(S) || !Controller::Storage["streams"][S].isMember("source")){
WARN_MSG("Shutting down unconfigured stream %s", strm->asStringRef().c_str());
nukeStream(strm->asStringRef());
continue;
}
char pageName[NAME_BUFFER_SIZE];
snprintf(pageName, NAME_BUFFER_SIZE, SHM_STREAM_META, strm->asStringRef().c_str());
IPC::sharedPage streamPage(pageName, 0, false, false);
if (streamPage){
Util::RelAccX rlxStrm(streamPage.mapped, false);
if (rlxStrm.isReady()){
std::string source = rlxStrm.getPointer("source");
const std::string & oriSource = Controller::Storage["streams"][S]["source"].asStringRef();
if (source != oriSource){
WARN_MSG("Source for %s is %s instead of %s; shutting it down", strm->asStringRef().c_str(), source.c_str(), oriSource.c_str());
nukeStream(strm->asStringRef());
}
}
}
}
} }
if (Request.isMember("invalidate_sessions")){ if (Request.isMember("invalidate_sessions")){