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

Generalized support for + in stream names as separator.

Browse source
This commit is contained in:
Thulinma 2014-09-30 11:41:48 +02:00
parent f6e854501d
commit b4feaebbe8
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/stream.cpp
View file

@ -42,18 +42,25 @@ std::string Util::getTmpFolder() {
return dir + "/"; return dir + "/";
} }
/// Filters the streamname, removing invalid characters and converting all /// Filters the streamname, removing invalid characters and converting all
/// letters to lowercase. If a '?' character is found, everything following /// letters to lowercase. If a '?' character is found, everything following
/// that character is deleted. The original string is modified. /// that character is deleted. The original string is modified. If a '+'
/// exists, then only the part before the + is sanitized.
void Util::Stream::sanitizeName(std::string & streamname) { void Util::Stream::sanitizeName(std::string & streamname) {
//strip anything that isn't numbers, digits or underscores //strip anything that isn't numbers, digits or underscores
size_t index = streamname.find('+');
if(index != std::string::npos){
std::string preplus = streamname.substr(0,index);
sanitizeName(preplus);
streamname = preplus +"+"+streamname.substr(index+1);
return;
}
for (std::string::iterator i = streamname.end() - 1; i >= streamname.begin(); --i) { for (std::string::iterator i = streamname.end() - 1; i >= streamname.begin(); --i) {
if (*i == '?') { if (*i == '?') {
streamname.erase(i, streamname.end()); streamname.erase(i, streamname.end());
break; break;
} }
if (!isalpha(*i) && !isdigit(*i) && *i != '_') { if ( !isalpha( *i) && !isdigit( *i) && *i != '_' && *i != '+' && *i != '.'){
streamname.erase(i); streamname.erase(i);
} else { } else {
*i = tolower(*i); *i = tolower(*i);
@ -134,12 +141,17 @@ bool Util::Stream::getVod(std::string filename, std::string streamname) {
bool Util::Stream::getStream(std::string streamname) { bool Util::Stream::getStream(std::string streamname) {
sanitizeName(streamname); sanitizeName(streamname);
JSON::Value ServConf = JSON::fromFile(getTmpFolder() + "streamlist"); JSON::Value ServConf = JSON::fromFile(getTmpFolder() + "streamlist");
if (ServConf["streams"].isMember(streamname)) { std::string smp = streamname.substr(0,(streamname.find('+')));
//check if the stream is already active, if yes, don't re-activate //check if smp (everything before +) exists
///\todo Check if the input type used for this stream supports + syntax, if not, reject the request if smp != streamname.
if (ServConf["streams"].isMember(smp)){
//Check if the stream is already active, if yes, don't activate again.
//Note: this uses the _whole_ stream name, including + (if any).
//This means "test+a" and "test+b" have separate locks and do not interact with each other.
IPC::semaphore playerLock(std::string("/lock_" + streamname).c_str(), O_CREAT | O_RDWR, ACCESSPERMS, 1); IPC::semaphore playerLock(std::string("/lock_" + streamname).c_str(), O_CREAT | O_RDWR, ACCESSPERMS, 1);
if (!playerLock.tryWait()) { if (!playerLock.tryWait()) {
playerLock.close(); playerLock.close();
DEBUG_MSG(DLVL_MEDIUM, "Playerlock for %s already active - not re-activating stream", streamname.c_str()); DEBUG_MSG(DLVL_MEDIUM, "Stream %s already active - not activating again", streamname.c_str());
return true; return true;
} }
playerLock.post(); playerLock.post();