diff --git a/src/svxlink/reflector/Reflector.cpp b/src/svxlink/reflector/Reflector.cpp index 22eed909..78e96059 100644 --- a/src/svxlink/reflector/Reflector.cpp +++ b/src/svxlink/reflector/Reflector.cpp @@ -656,6 +656,7 @@ void Reflector::httpRequestReceived(Async::HttpServerConnection *con, tg = 0; } node["tg"] = tg; + node["restrictedTG"] = TGHandler::instance()->isRestricted(tg); Json::Value tgs = Json::Value(Json::arrayValue); const std::set& monitored_tgs = client->monitoredTGs(); for (std::set::const_iterator mtg_it=monitored_tgs.begin(); diff --git a/src/svxlink/reflector/TGHandler.cpp b/src/svxlink/reflector/TGHandler.cpp index 4f83440a..973973a5 100644 --- a/src/svxlink/reflector/TGHandler.cpp +++ b/src/svxlink/reflector/TGHandler.cpp @@ -287,7 +287,7 @@ bool TGHandler::allowTgSelection(ReflectorClient *client, uint32_t tg) } /* TGHandler::allowTgSelection */ -bool TGHandler::showActivity(uint32_t tg) +bool TGHandler::showActivity(uint32_t tg) const { std::ostringstream ss; ss << "TG#" << tg; @@ -297,6 +297,15 @@ bool TGHandler::showActivity(uint32_t tg) } /* TGHandler::showActivity */ +bool TGHandler::isRestricted(uint32_t tg) const +{ + std::ostringstream ss; + ss << "TG#" << tg; + std::string allow; + return m_cfg->getValue(ss.str(), "ALLOW", allow); +} /* TGHandler::isRestricted */ + + /**************************************************************************** * * Protected member functions diff --git a/src/svxlink/reflector/TGHandler.h b/src/svxlink/reflector/TGHandler.h index 42c6a6c5..8e18e748 100644 --- a/src/svxlink/reflector/TGHandler.h +++ b/src/svxlink/reflector/TGHandler.h @@ -160,7 +160,9 @@ class TGHandler : public sigc::trackable bool allowTgSelection(ReflectorClient *client, uint32_t tg); - bool showActivity(uint32_t tg); + bool showActivity(uint32_t tg) const; + + bool isRestricted(uint32_t tg) const; sigc::signal talkerUpdated; diff --git a/src/versions b/src/versions index b58d2e95..3434056a 100644 --- a/src/versions +++ b/src/versions @@ -37,4 +37,4 @@ DEVCAL=1.0.2.99.6 SVXSERVER=0.0.6 # Version for SvxReflector -SVXREFLECTOR=1.99.12 +SVXREFLECTOR=1.99.13