\n added

[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 23d5f05fdc71bae163c9e759af08f90dd1a15f55..fc45fe04e2d15fc93558ba602f8e505e529b0240 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/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"
@@ -108,7 +102,9 @@ SMUX::SMUX()
       sensors(),
       tables(),
       notifiers(),
-      addDelNotifier(*this)
+      addUserNotifier(*this),
+      delUserNotifier(*this),
+      addDelTariffNotifier(*this)
 {
 pthread_mutex_init(&mutex, NULL);
 
@@ -161,12 +157,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.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
@@ -179,14 +175,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
-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();
-users->AddNotifierUserAdd(&addDelNotifier);
-users->AddNotifierUserDel(&addDelNotifier);
 
-#ifdef DEBUG
+#ifdef SMUX_DEBUG
 Sensors::const_iterator it(sensors.begin());
 while (it != sensors.end())
     {
@@ -215,8 +209,6 @@ int SMUX::Stop()
 printfd(__FILE__, "SMUX::Stop() - Before\n");
 running = false;
 
-users->DelNotifierUserDel(&addDelNotifier);
-users->DelNotifierUserAdd(&addDelNotifier);
 ResetNotifiers();
 
 if (!stopped)
@@ -321,6 +313,7 @@ if (it != smuxHandlers.end())
     }
 else
     {
+#ifdef SMUX_DEBUG
     switch (pdus->present)
         {
         case SMUX_PDUs_PR_NOTHING:
@@ -336,6 +329,7 @@ else
             printfd(__FILE__, "PDUs: undefined\n");
         }
     asn_fprint(stderr, &asn_DEF_SMUX_PDUs, pdus);
+#endif
     }
 return false;
 }
@@ -395,23 +389,53 @@ sensors.insert(newSensors.begin(), newSensors.end());
 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()
 {
-USER_PTR u;
 int h = users->OpenSearch();
 assert(h && "USERS::OpenSearch is always correct");
 
+USER_PTR u;
 while (!users->SearchNext(h, &u))
-    {
-    notifiers.push_back(CHG_AFTER_NOTIFIER(*this, u));
-    u->GetProperty().tariffName.AddAfterNotifier(&notifiers.back());
-    }
+    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())
     {
@@ -424,8 +448,3 @@ void CHG_AFTER_NOTIFIER::Notify(const std::string &, const std::string &)
 {
 smux.UpdateTables();
 }
-
-void ADD_DEL_USER_NOTIFIER::Notify(const USER_PTR &)
-{
-smux.UpdateTables();
-}