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

No longer hardcode localhost as bandwidth exception, instead auto-config local network exceptions when no exceptions are configured yet

Browse source
This commit is contained in:
Thulinma 2024-07-17 00:39:17 +02:00
parent c6078afc24
commit fb6af1c99e
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/controller/controller_statistics.cpp
View file

@ -169,21 +169,6 @@ void Controller::updateBandwidthConfig(){
} }
} }
} }
//Localhost is always excepted from counts
{
std::string newbins = Socket::getBinForms("::1");
if (offset + newbins.size() < 1700){
memcpy(noBWCountMatches + offset, newbins.data(), newbins.size());
offset += newbins.size();
}
}
{
std::string newbins = Socket::getBinForms("127.0.0.1/8");
if (offset + newbins.size() < 1700){
memcpy(noBWCountMatches + offset, newbins.data(), newbins.size());
offset += newbins.size();
}
}
} }
/// This function is ran whenever a stream becomes active. /// This function is ran whenever a stream becomes active.

8
src/controller/controller_storage.cpp
View file

@ -395,6 +395,14 @@ namespace Controller{
if (!Controller::Storage["config"].isMember("tknMode")){ if (!Controller::Storage["config"].isMember("tknMode")){
Controller::Storage["config"]["tknMode"] = SESS_TKN_DEFAULT_MODE; Controller::Storage["config"]["tknMode"] = SESS_TKN_DEFAULT_MODE;
} }
if (!Controller::Storage.isMember("bandwidth") || !Controller::Storage["bandwidth"].isMember("exceptions") || !Controller::Storage["bandwidth"]["exceptions"].size()){
Controller::Log("CONF", "Adding default bandwidth exception ranges (local networks) because nothing is configured");
Controller::Storage["bandwidth"]["exceptions"].append("::1");
Controller::Storage["bandwidth"]["exceptions"].append("127.0.0.0/8");
Controller::Storage["bandwidth"]["exceptions"].append("10.0.0.0/8");
Controller::Storage["bandwidth"]["exceptions"].append("192.168.0.0/16");
Controller::Storage["bandwidth"]["exceptions"].append("172.16.0.0/12");
}
Controller::prometheus = Controller::Storage["config"]["prometheus"].asStringRef(); Controller::prometheus = Controller::Storage["config"]["prometheus"].asStringRef();
Controller::accesslog = Controller::Storage["config"]["accesslog"].asStringRef(); Controller::accesslog = Controller::Storage["config"]["accesslog"].asStringRef();