#include <utility>
#include "stg/common.h"
-#include "stg/plugin_creator.h"
#include "smux.h"
#include "utils.h"
-PLUGIN_CREATOR<SMUX> smc;
-
-PLUGIN * GetPlugin()
+namespace
{
-return smc.GetPlugin();
-}
bool SPrefixLess(const Sensors::value_type & a,
const Sensors::value_type & b)
return a.first.PrefixLess(b.first);
}
+}
+
+extern "C" STG::Plugin* GetPlugin()
+{
+ static SMUX plugin;
+ return &plugin;
+}
+
SMUX_SETTINGS::SMUX_SETTINGS()
: errorStr(),
ip(0),
password()
{}
-int SMUX_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
+int SMUX_SETTINGS::ParseSettings(const STG::ModuleSettings & s)
{
-PARAM_VALUE pv;
-std::vector<PARAM_VALUE>::const_iterator pvi;
+STG::ParamValue pv;
+std::vector<STG::ParamValue>::const_iterator pvi;
int p;
pv.param = "Port";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end() || pvi->value.empty())
{
errorStr = "Parameter \'Port\' not found.";
printfd(__FILE__, "Parameter 'Port' not found\n");
printfd(__FILE__, "Cannot parse parameter 'Port'\n");
return -1;
}
-port = p;
+port = static_cast<uint16_t>(p);
pv.param = "Password";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end() || pvi->value.empty())
{
errorStr = "Parameter \'Password\' not found.";
printfd(__FILE__, "Parameter 'Password' not found\n");
pv.param = "Server";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end() || pvi->value.empty())
{
errorStr = "Parameter \'Server\' not found.";
printfd(__FILE__, "Parameter 'Server' not found\n");
}
SMUX::SMUX()
- : PLUGIN(),
- users(NULL),
+ : users(NULL),
tariffs(NULL),
admins(NULL),
services(NULL),
corporations(NULL),
traffcounter(NULL),
- errorStr(),
- smuxSettings(),
- settings(),
- thread(),
- mutex(),
- running(false),
stopped(true),
+ needReconnect(false),
+ lastReconnectTry(0),
+ reconnectTimeout(1),
sock(-1),
- smuxHandlers(),
- pdusHandlers(),
- sensors(),
- tables(),
- notifiers(),
addUserNotifier(*this),
delUserNotifier(*this),
- addDelTariffNotifier(*this)
+ addDelTariffNotifier(*this),
+ logger(STG::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;
delete it->second;
}
printfd(__FILE__, "SMUX::~SMUX()\n");
-pthread_mutex_destroy(&mutex);
}
int SMUX::ParseSettings()
assert(traffcounter != NULL && "traffcounter must not be NULL");
if (PrepareNet())
- return -1;
+ needReconnect = true;
// Users
sensors[OID(".1.3.6.1.4.1.38313.1.1.1")] = new TotalUsersSensor(*users);
sensors[OID(".1.3.6.1.4.1.38313.1.1.9")] = new CreditUsersSensor(*users);
sensors[OID(".1.3.6.1.4.1.38313.1.1.10")] = new FreeMbUsersSensor(*users);
sensors[OID(".1.3.6.1.4.1.38313.1.1.11")] = new TariffChangeUsersSensor(*users);
+sensors[OID(".1.3.6.1.4.1.38313.1.1.12")] = new ActiveUsersSensor(*users);
// Tariffs
sensors[OID(".1.3.6.1.4.1.38313.1.2.1")] = new TotalTariffsSensor(*tariffs);
// Admins
}
#endif
-if (!running)
- {
- if (pthread_create(&thread, NULL, Runner, this))
- {
- errorStr = "Cannot create thread.";
- printfd(__FILE__, "Cannot create thread\n");
- return -1;
- }
- }
+if (!m_thread.joinable())
+ m_thread = std::jthread([this](auto token){ Run(token); });
return 0;
}
int SMUX::Stop()
{
printfd(__FILE__, "SMUX::Stop() - Before\n");
-running = false;
+m_thread.request_stop();
if (!stopped)
{
struct timespec ts = {0, 200000000};
nanosleep(&ts, NULL);
}
-
- //after 5 seconds waiting thread still running. now killing it
- if (!stopped)
- {
- printfd(__FILE__, "SMUX::Stop() - failed to stop thread, killing it\n");
- if (pthread_kill(thread, SIGINT))
- {
- errorStr = "Cannot kill thread.";
- printfd(__FILE__, "SMUX::Stop() - Cannot kill thread\n");
- return -1;
- }
- printfd(__FILE__, "SMUX::Stop() - killed Run\n");
- }
}
-pthread_join(thread, NULL);
+if (!stopped)
+ m_thread.detach();
+else
+ m_thread.join();
ResetNotifiers();
close(sock);
+if (!stopped)
+ {
+ return -1;
+ }
+
printfd(__FILE__, "SMUX::Stop() - After\n");
return 0;
}
-int SMUX::Reload()
+int SMUX::Reload(const STG::ModuleSettings & /*ms*/)
{
if (Stop())
return -1;
if (Start())
return -1;
+if (!needReconnect)
+ {
+ printfd(__FILE__, "SMUX reconnected succesfully.\n");
+ logger("Reconnected successfully.");
+ }
return 0;
}
-void * SMUX::Runner(void * d)
-{
-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))
- return;
+ needReconnect = true;
if (!SendRReqPDU(sock))
- return;
-running = true;
+ needReconnect = true;
stopped = false;
-while(running)
+while (!token.stop_requested())
{
- if (WaitPackets(sock))
+ if (WaitPackets(sock) && !needReconnect)
{
SMUX_PDUs_t * pdus = RecvSMUXPDUs(sock);
if (pdus)
DispatchPDUs(pdus);
ASN_STRUCT_FREE(asn_DEF_SMUX_PDUs, pdus);
}
+ else if (!token.stop_requested())
+ Reconnect();
}
- if (!running)
+ else if (!token.stop_requested() && needReconnect)
+ Reconnect();
+ if (token.stop_requested())
break;
}
SendClosePDU(sock);
if (sock < 0)
{
errorStr = "Cannot create socket.";
+ logger("Cannot create a socket: %s", strerror(errno));
printfd(__FILE__, "Cannot create socket\n");
return true;
}
if (connect(sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr)))
{
errorStr = "Cannot connect.";
+ logger("Cannot connect the socket: %s", strerror(errno));
printfd(__FILE__, "Cannot connect. Message: '%s'\n", strerror(errno));
return true;
}
return false;
}
+bool SMUX::Reconnect()
+{
+if (needReconnect && difftime(time(NULL), lastReconnectTry) < reconnectTimeout)
+ return true;
+
+time(&lastReconnectTry);
+SendClosePDU(sock);
+close(sock);
+if (!PrepareNet())
+ if (SendOpenPDU(sock))
+ if (SendRReqPDU(sock))
+ {
+ reconnectTimeout = 1;
+ needReconnect = false;
+ logger("Connected successfully");
+ printfd(__FILE__, "Connected successfully\n");
+ return false;
+ }
+
+if (needReconnect)
+ if (reconnectTimeout < 60)
+ reconnectTimeout *= 2;
+
+needReconnect = true;
+return true;
+}
+
bool SMUX::DispatchPDUs(const SMUX_PDUs_t * pdus)
{
-SMUXHandlers::iterator it;
-it = smuxHandlers.find(pdus->present);
+SMUXHandlers::iterator it(smuxHandlers.find(pdus->present));
if (it != smuxHandlers.end())
{
return (this->*(it->second))(pdus);
}
+#ifdef SMUX_DEBUG
else
{
-#ifdef SMUX_DEBUG
switch (pdus->present)
{
case SMUX_PDUs_PR_NOTHING:
printfd(__FILE__, "PDUs: undefined\n");
}
asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
-#endif
}
+#endif
return false;
}
}
if (!done)
{
- Sensors::iterator it(newSensors.begin());
- while (it != newSensors.end())
+ Sensors::iterator sit(newSensors.begin());
+ while (sit != newSensors.end())
{
- delete it->second;
- ++it;
+ delete sit->second;
+ ++sit;
}
return false;
}
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());
+userPtr->GetProperties().tariffName.AddAfterNotifier(¬ifiers.back());
}
-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));
+ userPtr->GetProperties().tariffName.DelAfterNotifier(&(*it));
notifiers.erase(it);
break;
}
int h = users->OpenSearch();
assert(h && "USERS::OpenSearch is always correct");
-USER_PTR u;
+UserPtr u;
while (!users->SearchNext(h, &u))
SetNotifier(u);
users->DelNotifierUserDel(&delUserNotifier);
users->DelNotifierUserAdd(&addUserNotifier);
-std::list<CHG_AFTER_NOTIFIER>::iterator it = notifiers.begin();
+std::list<CHG_AFTER_NOTIFIER>::iterator it(notifiers.begin());
while (it != notifiers.end())
{
- it->GetUserPtr()->GetProperty().tariffName.DelAfterNotifier(&(*it));
+ it->GetUserPtr()->GetProperties().tariffName.DelAfterNotifier(&(*it));
++it;
}
-}
-
-void CHG_AFTER_NOTIFIER::Notify(const std::string &, const std::string &)
-{
-smux.UpdateTables();
+notifiers.clear();
}
git.stg.codes / stg.git / blobdiff