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

Added "invalidate_sessions" API call, made USER_NEW trigger even more atomic.

Browse source
This commit is contained in:
Thulinma 2016-05-20 10:56:22 +02:00
parent 303cc5684a
commit 5759dbef0f
7 changed files with 154 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

80
src/output/output.cpp
View file

@ -146,38 +146,59 @@ namespace Mist {
myConn.close();
}
}
if(Triggers::shouldTrigger("USER_NEW", streamName)){
//sync byte 0 = no sync yet, wait for sync from controller...
IPC::statExchange tmpEx(statsPage.getData());
unsigned int i = 0;
tmpEx.setSync(0);
while (!tmpEx.getSync() && i++ < 30){
Util::wait(100);
stats();
tmpEx = IPC::statExchange(statsPage.getData());
}
HIGH_MSG("USER_NEW sync achieved: %u", (unsigned int)tmpEx.getSync());
//1 = check requested (connection is new)
if (tmpEx.getSync() == 1){
std::string payload = streamName+"\n" + getConnectedHost() +"\n" + JSON::Value((long long)crc).asString() + "\n"+capa["name"].asStringRef()+"\n"+reqUrl;
if (!Triggers::doTrigger("USER_NEW", payload, streamName)){
MEDIUM_MSG("Closing connection because denied by USER_NEW trigger");
myConn.close();
tmpEx.setSync(100);//100 = denied
}else{
tmpEx.setSync(10);//10 = accepted
}
}
//100 = denied
if (tmpEx.getSync() == 100){
myConn.close();
MEDIUM_MSG("Closing connection because denied by USER_NEW sync byte");
}
//anything else = accepted
}
doSync(true);
/*LTS-END*/
}
/// If called with force set to true and a USER_NEW trigger enabled, forces a sync immediately.
/// Otherwise, does nothing unless the sync byte is set to 2, in which case it forces a sync as well.
/// May be called recursively because it calls stats() which calls this function.
/// If this happens, the extra calls to the function return instantly.
void Output::doSync(bool force){
static bool recursing = false;
if (recursing){return;}
recursing = true;
IPC::statExchange tmpEx(statsPage.getData());
if (tmpEx.getSync() == 2 || force){
if(Triggers::shouldTrigger("USER_NEW", streamName)){
//sync byte 0 = no sync yet, wait for sync from controller...
unsigned int i = 0;
tmpEx.setSync(0);
//wait max 10 seconds for sync
while ((!tmpEx.getSync() || tmpEx.getSync() == 2) && i++ < 100){
Util::wait(100);
stats();
tmpEx = IPC::statExchange(statsPage.getData());
}
HIGH_MSG("USER_NEW sync achieved: %u", (unsigned int)tmpEx.getSync());
//1 = check requested (connection is new)
if (tmpEx.getSync() == 1){
std::string payload = streamName+"\n" + getConnectedHost() +"\n" + JSON::Value((long long)crc).asString() + "\n"+capa["name"].asStringRef()+"\n"+reqUrl;
if (!Triggers::doTrigger("USER_NEW", payload, streamName)){
MEDIUM_MSG("Closing connection because denied by USER_NEW trigger");
myConn.close();
tmpEx.setSync(100);//100 = denied
}else{
tmpEx.setSync(10);//10 = accepted
}
}
//100 = denied
if (tmpEx.getSync() == 100){
myConn.close();
MEDIUM_MSG("Closing connection because denied by USER_NEW sync byte");
}
if (tmpEx.getSync() == 0 || tmpEx.getSync() == 2){
myConn.close();
FAIL_MSG("Closing connection because sync byte timeout!");
}
//anything else = accepted
}else{
tmpEx.setSync(10);//auto-accept if no trigger
}
}
recursing = false;
}
std::string Output::getConnectedHost(){
return myConn.getHost();
}
@ -1211,6 +1232,7 @@ namespace Mist {
statsPage.keepAlive();
}
}
doSync();
int tNum = 0;
if (!nProxy.userClient.getData()){
char userPageName[NAME_BUFFER_SIZE];

1
src/output/output.h
View file

@ -93,6 +93,7 @@ namespace Mist {
bool onList(std::string ip, std::string list);
std::string getCountry(std::string ip);
/*LTS-END*/
void doSync(bool force = false);
std::map<unsigned long, unsigned int> currKeyOpen;