Final icing on rlm_stg.

[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 5367e249b00c739fb548d772f852ae9f6789d8f0..09cb4636795b1f72d567dc6274e2d74f788a2fad 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.cpp
+++ b/projects/stargazer/plugins/other/smux/smux.cpp
@@ -20,12 +20,12 @@
 #include "smux.h"
 #include "utils.h"
 
 #include "smux.h"
 #include "utils.h"
 

+namespace
+{

 PLUGIN_CREATOR<SMUX> smc;
 
 PLUGIN_CREATOR<SMUX> smc;
 

-PLUGIN * GetPlugin()
-{
-return smc.GetPlugin();
-}
+bool SPrefixLess(const Sensors::value_type & a,
+                 const Sensors::value_type & b);

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


@@ -33,6 +33,15 @@ 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()
     : errorStr(),
       ip(0),
 SMUX_SETTINGS::SMUX_SETTINGS()
     : errorStr(),
       ip(0),


@@ -60,7 +69,7 @@ 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);


@@ -103,6 +112,9 @@ SMUX::SMUX()
       mutex(),
       running(false),
       stopped(true),
       mutex(),
       running(false),
       stopped(true),

+      needReconnect(false),
+      lastReconnectTry(0),
+      reconnectTimeout(1),

       sock(-1),
       smuxHandlers(),
       pdusHandlers(),
       sock(-1),
       smuxHandlers(),
       pdusHandlers(),


@@ -111,7 +123,8 @@ SMUX::SMUX()
       notifiers(),
       addUserNotifier(*this),
       delUserNotifier(*this),
       notifiers(),
       addUserNotifier(*this),
       delUserNotifier(*this),

-      addDelTariffNotifier(*this)
+      addDelTariffNotifier(*this),
+      logger(GetPluginLogger(GetStgLogger(), "smux"))

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


@@ -156,7 +169,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);


@@ -170,6 +183,7 @@ 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.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


@@ -203,6 +217,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;
         }


@@ -224,22 +239,10 @@ 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");
-        }

     }
 
     }
 

-pthread_join(thread, NULL);
+if (stopped)
+    pthread_join(thread, NULL);

 
 ResetNotifiers();
 
 
 ResetNotifiers();
 


@@ -259,6 +262,12 @@ 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;
 }


@@ -269,6 +278,11 @@ if (Stop())
     return -1;
 if (Start())
     return -1;
     return -1;
 if (Start())
     return -1;

+if (!needReconnect)
+    {
+    printfd(__FILE__, "SMUX reconnected succesfully.\n");
+    logger("Reconnected successfully.");
+    }

 return 0;
 }
 
 return 0;
 }
 


@@ -289,15 +303,15 @@ void SMUX::Run()
 {
 stopped = true;
 if (!SendOpenPDU(sock))
 {
 stopped = true;
 if (!SendOpenPDU(sock))

-    return;
+    needReconnect = true;

 if (!SendRReqPDU(sock))
 if (!SendRReqPDU(sock))

-    return;
+    needReconnect = true;

 running = true;
 stopped = false;
 
 while(running)
     {
 running = true;
 stopped = false;
 
 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)


@@ -305,7 +319,11 @@ while(running)
             DispatchPDUs(pdus);
             ASN_STRUCT_FREE(asn_DEF_SMUX_PDUs, 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;
     }


@@ -320,6 +338,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;
     }


@@ -333,6 +352,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;
     }


@@ -340,17 +360,43 @@ 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
     {
 else
     {

-#ifdef SMUX_DEBUG

     switch (pdus->present)
         {
         case SMUX_PDUs_PR_NOTHING:
     switch (pdus->present)
         {
         case SMUX_PDUs_PR_NOTHING:


@@ -366,8 +412,8 @@ else
             printfd(__FILE__, "PDUs: undefined\n");
         }
     asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
             printfd(__FILE__, "PDUs: undefined\n");
         }
     asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);

-#endif

     }
     }

+#endif

 return false;
 }
 
 return false;
 }
 


@@ -473,15 +519,11 @@ tariffs->DelNotifierAdd(&addDelTariffNotifier);
 users->DelNotifierUserDel(&delUserNotifier);
 users->DelNotifierUserAdd(&addUserNotifier);
 
 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;
     }
 while (it != notifiers.end())
     {
     it->GetUserPtr()->GetProperty().tariffName.DelAfterNotifier(&(*it));
     ++it;
     }

-}
-
-void CHG_AFTER_NOTIFIER::Notify(const std::string &, const std::string &)
-{
-smux.UpdateTables();
+notifiers.clear();

 }
 }