Initialize some members in initialization lists

[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 cc69aa8132f79bb9f96af718048ce519198b7fc9..61ed80269f9bf9275460cb451c43d12f8575c761 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.cpp
+++ b/projects/stargazer/plugins/other/smux/smux.cpp
@@ -16,12 +16,6 @@
 
 #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"


@@ -40,8 +34,10 @@ return a.first.PrefixLess(b.first);
 }
 
 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)


@@ -100,6 +96,11 @@ SMUX::SMUX()
       services(NULL),
       corporations(NULL),
       traffcounter(NULL),
       services(NULL),
       corporations(NULL),
       traffcounter(NULL),

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

       running(false),
       stopped(true),
       sock(-1),
       running(false),
       stopped(true),
       sock(-1),


@@ -163,12 +164,12 @@ 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);

 // 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


@@ -181,12 +182,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", *tariffs, *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();
 SetNotifiers();
 
 
 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())
     {


@@ -215,8 +216,6 @@ int SMUX::Stop()
 printfd(__FILE__, "SMUX::Stop() - Before\n");
 running = false;
 
 printfd(__FILE__, "SMUX::Stop() - Before\n");
 running = false;
 

-ResetNotifiers();
-

 if (!stopped)
     {
     //5 seconds to thread stops itself
 if (!stopped)
     {
     //5 seconds to thread stops itself


@@ -242,12 +241,37 @@ if (!stopped)
 
 pthread_join(thread, NULL);
 
 
 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;
+    }
+
+tables.erase(tables.begin(), tables.end());
+sensors.erase(sensors.begin(), sensors.end());
+

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

+int SMUX::Reload()
+{
+if (Stop())
+    return -1;
+if (Start())
+    return -1;
+return 0;
+}
+

 void * SMUX::Runner(void * d)
 {
 SMUX * smux = static_cast<SMUX *>(d);
 void * SMUX::Runner(void * d)
 {
 SMUX * smux = static_cast<SMUX *>(d);


@@ -259,8 +283,11 @@ return NULL;
 
 void SMUX::Run()
 {
 
 void SMUX::Run()
 {

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

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


@@ -319,6 +346,7 @@ if (it != smuxHandlers.end())
     }
 else
     {
     }
 else
     {

+#ifdef SMUX_DEBUG

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


@@ -334,6 +362,7 @@ 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

     }
 return false;
 }
     }
 return false;
 }