-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
+#include "smux.h"
+#include "utils.h"
-#include <cstring>
-#include <cerrno>
-#include <ctime>
-#include <csignal>
-#include <cassert>
+#include "stg/common.h"
#include <vector>
#include <algorithm>
#include <stdexcept>
#include <utility>
-#include "stg/common.h"
-#include "stg/plugin_creator.h"
+#include <cstring>
+#include <cerrno>
+#include <ctime>
+#include <csignal>
+#include <cassert>
-#include "smux.h"
-#include "utils.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+
+using STG::SMUX;
+using STG::SMUX_SETTINGS;
namespace
{
-PLUGIN_CREATOR<SMUX> smc;
bool SPrefixLess(const Sensors::value_type & a,
const Sensors::value_type & b)
}
-extern "C" PLUGIN * GetPlugin();
-
-PLUGIN * GetPlugin()
+extern "C" STG::Plugin* GetPlugin()
{
-return smc.GetPlugin();
+ static SMUX plugin;
+ return &plugin;
}
SMUX_SETTINGS::SMUX_SETTINGS()
- : errorStr(),
- ip(0),
- port(0),
- password()
+ : ip(0),
+ port(0)
{}
-int SMUX_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+int SMUX_SETTINGS::ParseSettings(const ModuleSettings & s)
{
-PARAM_VALUE pv;
-std::vector<PARAM_VALUE>::const_iterator pvi;
+ParamValue pv;
int p;
pv.param = "Port";
-pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
+auto pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
if (pvi == s.moduleParams.end() || pvi->value.empty())
{
errorStr = "Parameter \'Port\' not found.";
printfd(__FILE__, "Parameter 'Port' not found\n");
return -1;
}
-if (ParseIntInRange(pvi->value[0], 2, 65535, &p))
+if (ParseIntInRange(pvi->value[0], 2, 65535, &p) != 0)
{
errorStr = "Cannot parse parameter \'Port\': " + errorStr;
printfd(__FILE__, "Cannot parse parameter 'Port'\n");
}
SMUX::SMUX()
- : PLUGIN(),
- users(NULL),
- tariffs(NULL),
- admins(NULL),
- services(NULL),
- corporations(NULL),
- traffcounter(NULL),
- errorStr(),
- smuxSettings(),
- settings(),
- thread(),
- mutex(),
- running(false),
+ : users(nullptr),
+ tariffs(nullptr),
+ admins(nullptr),
+ services(nullptr),
+ corporations(nullptr),
+ traffcounter(nullptr),
stopped(true),
needReconnect(false),
lastReconnectTry(0),
reconnectTimeout(1),
sock(-1),
- smuxHandlers(),
- pdusHandlers(),
- sensors(),
- tables(),
- notifiers(),
- addUserNotifier(*this),
- delUserNotifier(*this),
- addDelTariffNotifier(*this),
- logger(GetPluginLogger(GetStgLogger(), "smux"))
+ logger(PluginLogger::get("smux"))
{
-pthread_mutex_init(&mutex, NULL);
-
smuxHandlers[SMUX_PDUs_PR_close] = &SMUX::CloseHandler;
smuxHandlers[SMUX_PDUs_PR_registerResponse] = &SMUX::RegisterResponseHandler;
smuxHandlers[SMUX_PDUs_PR_pdus] = &SMUX::PDUsRequestHandler;
SMUX::~SMUX()
{
- {
- Sensors::iterator it;
- for (it = sensors.begin(); it != sensors.end(); ++it)
- delete it->second;
- }
- {
- Tables::iterator it;
- for (it = tables.begin(); it != tables.end(); ++it)
- delete it->second;
- }
-printfd(__FILE__, "SMUX::~SMUX()\n");
-pthread_mutex_destroy(&mutex);
+ for (auto& kv : sensors)
+ delete kv.second;
+ for (auto& kv : tables)
+ delete kv.second;
+ printfd(__FILE__, "SMUX::~SMUX()\n");
}
int SMUX::ParseSettings()
int SMUX::Start()
{
-assert(users != NULL && "users must not be NULL");
-assert(tariffs != NULL && "tariffs must not be NULL");
-assert(admins != NULL && "admins must not be NULL");
-assert(services != NULL && "services must not be NULL");
-assert(corporations != NULL && "corporations must not be NULL");
-assert(traffcounter != NULL && "traffcounter must not be NULL");
+assert(users != nullptr && "users must not be NULL");
+assert(tariffs != nullptr && "tariffs must not be NULL");
+assert(admins != nullptr && "admins must not be NULL");
+assert(services != nullptr && "services must not be NULL");
+assert(corporations != nullptr && "corporations must not be NULL");
+assert(traffcounter != nullptr && "traffcounter must not be NULL");
if (PrepareNet())
needReconnect = true;
SetNotifiers();
#ifdef SMUX_DEBUG
-Sensors::const_iterator it(sensors.begin());
+auto it = sensors.begin();
while (it != sensors.end())
{
printfd(__FILE__, "%s = %s\n",
}
#endif
-if (!running)
- {
- if (pthread_create(&thread, NULL, Runner, this))
- {
- errorStr = "Cannot create thread.";
- logger("Cannot create thread.");
- printfd(__FILE__, "Cannot create thread\n");
- return -1;
- }
- }
+if (!m_thread.joinable())
+ m_thread = std::jthread([this](auto token){ Run(std::move(token)); });
return 0;
}
int SMUX::Stop()
{
printfd(__FILE__, "SMUX::Stop() - Before\n");
-running = false;
+m_thread.request_stop();
if (!stopped)
{
for (int i = 0; i < 25 && !stopped; i++)
{
struct timespec ts = {0, 200000000};
- nanosleep(&ts, NULL);
+ nanosleep(&ts, nullptr);
}
}
-if (stopped)
- pthread_join(thread, NULL);
+if (!stopped)
+ m_thread.detach();
+else
+ m_thread.join();
ResetNotifiers();
- {
- Tables::iterator it;
- for (it = tables.begin(); it != tables.end(); ++it)
- delete it->second;
- }
- {
- Sensors::iterator it;
- for (it = sensors.begin(); it != sensors.end(); ++it)
- delete it->second;
- }
+for (auto& kv : sensors)
+ delete kv.second;
+for (auto& kv : tables)
+ delete kv.second;
tables.erase(tables.begin(), tables.end());
sensors.erase(sensors.begin(), sensors.end());
if (!stopped)
{
- running = true;
return -1;
}
return 0;
}
-int SMUX::Reload(const MODULE_SETTINGS & /*ms*/)
+int SMUX::Reload(const ModuleSettings & /*ms*/)
{
-if (Stop())
+if (Stop() != 0)
return -1;
-if (Start())
+if (Start() != 0)
return -1;
if (!needReconnect)
{
return 0;
}
-void * SMUX::Runner(void * d)
-{
-sigset_t signalSet;
-sigfillset(&signalSet);
-pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
-
-SMUX * smux = static_cast<SMUX *>(d);
-
-smux->Run();
-
-return NULL;
-}
-
-void SMUX::Run()
+void SMUX::Run(std::stop_token token)
{
stopped = true;
if (!SendOpenPDU(sock))
needReconnect = true;
if (!SendRReqPDU(sock))
needReconnect = true;
-running = true;
stopped = false;
-while(running)
+while (!token.stop_requested())
{
if (WaitPackets(sock) && !needReconnect)
{
- SMUX_PDUs_t * pdus = RecvSMUXPDUs(sock);
- if (pdus)
+ auto* pdus = RecvSMUXPDUs(sock);
+ if (pdus != nullptr)
{
DispatchPDUs(pdus);
ASN_STRUCT_FREE(asn_DEF_SMUX_PDUs, pdus);
}
- else if (running)
+ else if (!token.stop_requested())
Reconnect();
}
- else if (running && needReconnect)
+ else if (!token.stop_requested() && needReconnect)
Reconnect();
- if (!running)
+ if (token.stop_requested())
break;
}
SendClosePDU(sock);
addr.sin_port = htons(smuxSettings.GetPort());
addr.sin_addr.s_addr = smuxSettings.GetIP();
-if (connect(sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr)))
+if (connect(sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr)) != 0)
{
errorStr = "Cannot connect.";
logger("Cannot connect the socket: %s", strerror(errno));
bool SMUX::Reconnect()
{
-if (needReconnect && difftime(time(NULL), lastReconnectTry) < reconnectTimeout)
+if (needReconnect && difftime(time(nullptr), lastReconnectTry) < reconnectTimeout)
return true;
time(&lastReconnectTry);
bool SMUX::DispatchPDUs(const SMUX_PDUs_t * pdus)
{
-SMUXHandlers::iterator it(smuxHandlers.find(pdus->present));
+auto it = smuxHandlers.find(pdus->present);
if (it != smuxHandlers.end())
- {
return (this->*(it->second))(pdus);
- }
#ifdef SMUX_DEBUG
else
{
{
Sensors newSensors;
bool done = true;
-Tables::iterator it(tables.begin());
+auto it = tables.begin();
while (it != tables.end())
{
try
}
if (!done)
{
- Sensors::iterator it(newSensors.begin());
- while (it != newSensors.end())
+ auto sit = newSensors.begin();
+ while (sit != newSensors.end())
{
- delete it->second;
- ++it;
+ delete sit->second;
+ ++sit;
}
return false;
}
it = tables.begin();
while (it != tables.end())
{
- std::pair<Sensors::iterator, Sensors::iterator> res;
- res = std::equal_range(sensors.begin(),
- sensors.end(),
- std::pair<OID, Sensor *>(OID(it->first), NULL),
- SPrefixLess);
- Sensors::iterator sit(res.first);
+ auto res = std::equal_range(sensors.begin(),
+ sensors.end(),
+ std::pair<OID, Sensor *>(OID(it->first), nullptr),
+ SPrefixLess);
+ auto sit = res.first;
while (sit != res.second)
{
delete sit->second;
return true;
}
-void SMUX::SetNotifier(USER_PTR userPtr)
+void SMUX::SetNotifier(UserPtr userPtr)
{
-notifiers.push_back(CHG_AFTER_NOTIFIER(*this, userPtr));
-userPtr->GetProperty().tariffName.AddAfterNotifier(¬ifiers.back());
+ m_conns.emplace_back(
+ userPtr->GetID(),
+ userPtr->GetProperties().tariffName.afterChange([this](const auto&, const auto&){ UpdateTables(); })
+ );
}
-void SMUX::UnsetNotifier(USER_PTR userPtr)
+void SMUX::UnsetNotifier(UserPtr userPtr)
{
-std::list<CHG_AFTER_NOTIFIER>::iterator it = notifiers.begin();
-while (it != notifiers.end())
- {
- if (it->GetUserPtr() == userPtr)
- {
- userPtr->GetProperty().tariffName.DelAfterNotifier(&(*it));
- notifiers.erase(it);
- break;
- }
- ++it;
- }
+ m_conns.erase(std::remove_if(m_conns.begin(), m_conns.end(),
+ [userPtr](const auto& c){ return std::get<0>(c) == userPtr->GetID(); }),
+ m_conns.end());
}
void SMUX::SetNotifiers()
int h = users->OpenSearch();
assert(h && "USERS::OpenSearch is always correct");
-USER_PTR u;
-while (!users->SearchNext(h, &u))
+UserPtr u;
+while (users->SearchNext(h, &u) == 0)
SetNotifier(u);
users->CloseSearch(h);
-users->AddNotifierUserAdd(&addUserNotifier);
-users->AddNotifierUserDel(&delUserNotifier);
-
-tariffs->AddNotifierAdd(&addDelTariffNotifier);
-tariffs->AddNotifierDel(&addDelTariffNotifier);
+m_onAddUserConn = users->onAdd([this](auto user){
+ SetNotifier(user);
+ UpdateTables();
+});
+m_onDelUserConn = users->onDel([this](auto user){
+ UnsetNotifier(user);
+ UpdateTables();
+});
+
+auto updateTables = [this](const TariffData&){ UpdateTables(); };
+m_onAddTariffConn = tariffs->onAdd(updateTables);
+m_onDelTariffConn = tariffs->onDel(updateTables);
}
void SMUX::ResetNotifiers()
{
-tariffs->DelNotifierDel(&addDelTariffNotifier);
-tariffs->DelNotifierAdd(&addDelTariffNotifier);
+m_onAddTariffConn.disconnect();
+m_onDelTariffConn.disconnect();
-users->DelNotifierUserDel(&delUserNotifier);
-users->DelNotifierUserAdd(&addUserNotifier);
+m_onAddUserConn.disconnect();
+m_onDelUserConn.disconnect();
-std::list<CHG_AFTER_NOTIFIER>::iterator it(notifiers.begin());
-while (it != notifiers.end())
- {
- it->GetUserPtr()->GetProperty().tariffName.DelAfterNotifier(&(*it));
- ++it;
- }
-notifiers.clear();
+m_conns.clear();
}
git.stg.codes / stg.git / blobdiff