Remove dead code.

[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 bef6e462343bd3ab5175ca9112d5583d5b72f6e8..4586807c9c4c6c581fa38466a2e2522573eefe3f 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.cpp
+++ b/projects/stargazer/plugins/other/smux/smux.cpp
@@ -20,12 +20,9 @@
 #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)


@@ -33,6 +30,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),


@@ -48,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");


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


@@ -77,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");


@@ -103,6 +109,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(),


@@ -157,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);


@@ -260,12 +269,17 @@ printfd(__FILE__, "SMUX::Stop() - After\n");
 return 0;
 }
 
 return 0;
 }
 

-int SMUX::Reload()
+int SMUX::Reload(const MODULE_SETTINGS & /*ms*/)

 {
 if (Stop())
     return -1;
 if (Start())
     return -1;
 {
 if (Stop())
     return -1;
 if (Start())
     return -1;

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

 return 0;
 }
 
 return 0;
 }
 


@@ -286,15 +300,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)


@@ -302,7 +316,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;
     }


@@ -339,6 +357,33 @@ 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)
 {
 SMUXHandlers::iterator it(smuxHandlers.find(pdus->present));
 bool SMUX::DispatchPDUs(const SMUX_PDUs_t * pdus)
 {
 SMUXHandlers::iterator it(smuxHandlers.find(pdus->present));