Ticket 37. The object tariff definition moved into the if(newTariff)

[stg.git] / projects / stargazer / plugins / other / smux / smux.cpp

diff --git a/projects/stargazer/plugins/other/smux/smux.cpp b/projects/stargazer/plugins/other/smux/smux.cpp
index d3f5bbdb547241d549141418218cd98fe8b4582e..4586807c9c4c6c581fa38466a2e2522573eefe3f 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.cpp
+++ b/projects/stargazer/plugins/other/smux/smux.cpp
@@ -16,22 +16,13 @@
 
 #include "stg/common.h"
 #include "stg/plugin_creator.h"
 
 #include "stg/common.h"
 #include "stg/plugin_creator.h"

-/*#include "stg/users.h"
-#include "stg/tariffs.h"
-#include "stg/admins.h"
-#include "stg/services.h"
-#include "stg/corporations.h"
-#include "stg/traffcounter.h"*/

 
 #include "smux.h"
 #include "utils.h"
 
 
 #include "smux.h"
 #include "utils.h"
 

-PLUGIN_CREATOR<SMUX> smc;
-
-PLUGIN * GetPlugin()
+namespace

 {
 {

-return smc.GetPlugin();
-}
+PLUGIN_CREATOR<SMUX> smc;

 
 bool SPrefixLess(const Sensors::value_type & a,
                  const Sensors::value_type & b)
 
 bool SPrefixLess(const Sensors::value_type & a,
                  const Sensors::value_type & b)


@@ -39,9 +30,20 @@ bool SPrefixLess(const Sensors::value_type & a,
 return a.first.PrefixLess(b.first);
 }
 
 return a.first.PrefixLess(b.first);
 }
 

+}
+
+extern "C" PLUGIN * GetPlugin();
+
+PLUGIN * GetPlugin()
+{
+return smc.GetPlugin();
+}
+

 SMUX_SETTINGS::SMUX_SETTINGS()
 SMUX_SETTINGS::SMUX_SETTINGS()

-    : ip(0),
-      port(0)
+    : errorStr(),
+      ip(0),
+      port(0),
+      password()

 {}
 
 int SMUX_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {}
 
 int SMUX_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)


@@ -52,7 +54,7 @@ int p;
 
 pv.param = "Port";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
 
 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");
     {
     errorStr = "Parameter \'Port\' not found.";
     printfd(__FILE__, "Parameter 'Port' not found\n");


@@ -64,11 +66,11 @@ if (ParseIntInRange(pvi->value[0], 2, 65535, &p))
     printfd(__FILE__, "Cannot parse parameter 'Port'\n");
     return -1;
     }
     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);
 
 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");
     {
     errorStr = "Parameter \'Password\' not found.";
     printfd(__FILE__, "Parameter 'Password' not found\n");


@@ -81,7 +83,7 @@ else
 
 pv.param = "Server";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
 
 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");
     {
     errorStr = "Parameter \'Server\' not found.";
     printfd(__FILE__, "Parameter 'Server' not found\n");


@@ -100,9 +102,26 @@ SMUX::SMUX()
       services(NULL),
       corporations(NULL),
       traffcounter(NULL),
       services(NULL),
       corporations(NULL),
       traffcounter(NULL),

+      errorStr(),
+      smuxSettings(),
+      settings(),
+      thread(),
+      mutex(),

       running(false),
       stopped(true),
       running(false),
       stopped(true),

-      sock(-1)
+      needReconnect(false),
+      lastReconnectTry(0),
+      reconnectTimeout(1),
+      sock(-1),
+      smuxHandlers(),
+      pdusHandlers(),
+      sensors(),
+      tables(),
+      notifiers(),
+      addUserNotifier(*this),
+      delUserNotifier(*this),
+      addDelTariffNotifier(*this),
+      logger(GetPluginLogger(GetStgLogger(), "smux"))

 {
 pthread_mutex_init(&mutex, NULL);
 
 {
 pthread_mutex_init(&mutex, NULL);
 


@@ -147,7 +166,7 @@ assert(corporations != NULL && "corporations must not be NULL");
 assert(traffcounter != NULL && "traffcounter must not be NULL");
 
 if (PrepareNet())
 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);
 
 // Users
 sensors[OID(".1.3.6.1.4.1.38313.1.1.1")] = new TotalUsersSensor(*users);


@@ -155,12 +174,13 @@ sensors[OID(".1.3.6.1.4.1.38313.1.1.2")] = new ConnectedUsersSensor(*users);
 sensors[OID(".1.3.6.1.4.1.38313.1.1.3")] = new AuthorizedUsersSensor(*users);
 sensors[OID(".1.3.6.1.4.1.38313.1.1.4")] = new AlwaysOnlineUsersSensor(*users);
 sensors[OID(".1.3.6.1.4.1.38313.1.1.5")] = new NoCashUsersSensor(*users);
 sensors[OID(".1.3.6.1.4.1.38313.1.1.3")] = new AuthorizedUsersSensor(*users);
 sensors[OID(".1.3.6.1.4.1.38313.1.1.4")] = new AlwaysOnlineUsersSensor(*users);
 sensors[OID(".1.3.6.1.4.1.38313.1.1.5")] = new NoCashUsersSensor(*users);

-sensors[OID(".1.3.6.1.4.1.38313.1.1.7")] = new DisabledDetailStatsUsersSensor(*users);
-sensors[OID(".1.3.6.1.4.1.38313.1.1.8")] = new DisabledUsersSensor(*users);
-sensors[OID(".1.3.6.1.4.1.38313.1.1.9")] = new PassiveUsersSensor(*users);
-sensors[OID(".1.3.6.1.4.1.38313.1.1.10")] = new CreditUsersSensor(*users);
-sensors[OID(".1.3.6.1.4.1.38313.1.1.11")] = new FreeMbUsersSensor(*users);
-sensors[OID(".1.3.6.1.4.1.38313.1.1.12")] = new TariffChangeUsersSensor(*users);
+sensors[OID(".1.3.6.1.4.1.38313.1.1.6")] = new DisabledDetailStatsUsersSensor(*users);
+sensors[OID(".1.3.6.1.4.1.38313.1.1.7")] = new DisabledUsersSensor(*users);
+sensors[OID(".1.3.6.1.4.1.38313.1.1.8")] = new PassiveUsersSensor(*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
 // Tariffs
 sensors[OID(".1.3.6.1.4.1.38313.1.2.1")] = new TotalTariffsSensor(*tariffs);
 // Admins


@@ -173,11 +193,12 @@ sensors[OID(".1.3.6.1.4.1.38313.1.5.1")] = new TotalCorporationsSensor(*corporat
 sensors[OID(".1.3.6.1.4.1.38313.1.6.1")] = new TotalRulesSensor(*traffcounter);
 
 // Table data
 sensors[OID(".1.3.6.1.4.1.38313.1.6.1")] = new TotalRulesSensor(*traffcounter);
 
 // Table data

-tables[".1.3.6.1.4.1.38313.1.1.6"] = new TariffUsersTable(".1.3.6.1.4.1.38313.1.1.6", *users);
+tables[".1.3.6.1.4.1.38313.1.2.2"] = new TariffUsersTable(".1.3.6.1.4.1.38313.1.2.2", *tariffs, *users);

 
 UpdateTables();
 
 UpdateTables();

+SetNotifiers();

 
 

-#ifdef DEBUG
+#ifdef SMUX_DEBUG

 Sensors::const_iterator it(sensors.begin());
 while (it != sensors.end())
     {
 Sensors::const_iterator it(sensors.begin());
 while (it != sensors.end())
     {


@@ -193,6 +214,7 @@ if (!running)
     if (pthread_create(&thread, NULL, Runner, this))
         {
         errorStr = "Cannot create thread.";
     if (pthread_create(&thread, NULL, Runner, this))
         {
         errorStr = "Cannot create thread.";

+       logger("Cannot create thread.");

         printfd(__FILE__, "Cannot create thread\n");
         return -1;
         }
         printfd(__FILE__, "Cannot create thread\n");
         return -1;
         }


@@ -214,31 +236,59 @@ if (!stopped)
         struct timespec ts = {0, 200000000};
         nanosleep(&ts, NULL);
         }
         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");
-        }
+if (stopped)
+    pthread_join(thread, NULL);
+
+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;

     }
 
     }
 

-pthread_join(thread, NULL);
+tables.erase(tables.begin(), tables.end());
+sensors.erase(sensors.begin(), sensors.end());

 
 close(sock);
 
 
 close(sock);
 

+if (!stopped)
+    {
+    running = true;
+    return -1;
+    }
+

 printfd(__FILE__, "SMUX::Stop() - After\n");
 return 0;
 }
 
 printfd(__FILE__, "SMUX::Stop() - After\n");
 return 0;
 }
 

+int SMUX::Reload(const MODULE_SETTINGS & /*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)
 {
 void * SMUX::Runner(void * d)
 {

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 SMUX * smux = static_cast<SMUX *>(d);
 
 smux->Run();
 SMUX * smux = static_cast<SMUX *>(d);
 
 smux->Run();


@@ -248,18 +298,29 @@ return NULL;
 
 void SMUX::Run()
 {
 
 void SMUX::Run()
 {

-SendOpenPDU(sock);
-SendRReqPDU(sock);
+stopped = true;
+if (!SendOpenPDU(sock))
+    needReconnect = true;
+if (!SendRReqPDU(sock))
+    needReconnect = true;

 running = true;
 stopped = false;
 running = true;
 stopped = false;

+

 while(running)
     {
 while(running)
     {

-    if (WaitPackets(sock))
+    if (WaitPackets(sock) && !needReconnect)

         {
         SMUX_PDUs_t * pdus = RecvSMUXPDUs(sock);
         if (pdus)
         {
         SMUX_PDUs_t * pdus = RecvSMUXPDUs(sock);
         if (pdus)

+            {

             DispatchPDUs(pdus);
             DispatchPDUs(pdus);

+            ASN_STRUCT_FREE(asn_DEF_SMUX_PDUs, pdus);
+            }
+        else if (running)
+            Reconnect();

         }
         }

+    else if (running && needReconnect)
+        Reconnect();

     if (!running)
         break;
     }
     if (!running)
         break;
     }


@@ -274,6 +335,7 @@ sock = socket(AF_INET, SOCK_STREAM, 0);
 if (sock < 0)
     {
     errorStr = "Cannot create socket.";
 if (sock < 0)
     {
     errorStr = "Cannot create socket.";

+    logger("Cannot create a socket: %s", strerror(errno));

     printfd(__FILE__, "Cannot create socket\n");
     return true;
     }
     printfd(__FILE__, "Cannot create socket\n");
     return true;
     }


@@ -287,6 +349,7 @@ addr.sin_addr.s_addr = smuxSettings.GetIP();
 if (connect(sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr)))
     {
     errorStr = "Cannot connect.";
 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;
     }
     printfd(__FILE__, "Cannot connect. Message: '%s'\n", strerror(errno));
     return true;
     }


@@ -294,14 +357,41 @@ if (connect(sock, reinterpret_cast<struct sockaddr *>(&addr), sizeof(addr)))
 return false;
 }
 
 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)
 {
 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);
     }
 if (it != smuxHandlers.end())
     {
     return (this->*(it->second))(pdus);
     }

+#ifdef SMUX_DEBUG

 else
     {
     switch (pdus->present)
 else
     {
     switch (pdus->present)


@@ -320,6 +410,7 @@ else
         }
     asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
     }
         }
     asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
     }

+#endif

 return false;
 }
 
 return false;
 }
 


@@ -377,3 +468,59 @@ sensors.insert(newSensors.begin(), newSensors.end());
 
 return true;
 }
 
 return true;
 }

+
+void SMUX::SetNotifier(USER_PTR userPtr)
+{
+notifiers.push_back(CHG_AFTER_NOTIFIER(*this, userPtr));
+userPtr->GetProperty().tariffName.AddAfterNotifier(&notifiers.back());
+}
+
+void SMUX::UnsetNotifier(USER_PTR 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;
+    }
+}
+
+void SMUX::SetNotifiers()
+{
+int h = users->OpenSearch();
+assert(h && "USERS::OpenSearch is always correct");
+
+USER_PTR u;
+while (!users->SearchNext(h, &u))
+    SetNotifier(u);
+
+users->CloseSearch(h);
+
+users->AddNotifierUserAdd(&addUserNotifier);
+users->AddNotifierUserDel(&delUserNotifier);
+
+tariffs->AddNotifierAdd(&addDelTariffNotifier);
+tariffs->AddNotifierDel(&addDelTariffNotifier);
+}
+
+void SMUX::ResetNotifiers()
+{
+tariffs->DelNotifierDel(&addDelTariffNotifier);
+tariffs->DelNotifierAdd(&addDelTariffNotifier);
+
+users->DelNotifierUserDel(&delUserNotifier);
+users->DelNotifierUserAdd(&addUserNotifier);
+
+std::list<CHG_AFTER_NOTIFIER>::iterator it(notifiers.begin());
+while (it != notifiers.end())
+    {
+    it->GetUserPtr()->GetProperty().tariffName.DelAfterNotifier(&(*it));
+    ++it;
+    }
+notifiers.clear();
+}