Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / stargazer / plugins / other / smux / sensors.h

diff --git a/projects/stargazer/plugins/other/smux/sensors.h b/projects/stargazer/plugins/other/smux/sensors.h
index 16331b15fcaedfde179a230a515a7032039d1c1e..35de996cb3377f4ef48189f639a7a27df70e505f 100644 (file)
--- a/projects/stargazer/plugins/other/smux/sensors.h
+++ b/projects/stargazer/plugins/other/smux/sensors.h
@@ -5,6 +5,10 @@
 
 #include "stg/users.h"
 #include "stg/tariffs.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 "stg/user_property.h"
 
 #include "stg/ObjectSyntax.h"
 #include "stg/user_property.h"
 
 #include "stg/ObjectSyntax.h"


@@ -14,6 +18,7 @@
 
 class Sensor {
     public:
 
 class Sensor {
     public:

+        virtual ~Sensor() {}

         virtual bool GetValue(ObjectSyntax_t * objectSyntax) const = 0;
 #ifdef DEBUG
         virtual std::string ToString() const = 0;
         virtual bool GetValue(ObjectSyntax_t * objectSyntax) const = 0;
 #ifdef DEBUG
         virtual std::string ToString() const = 0;


@@ -24,18 +29,18 @@ typedef std::map<OID, Sensor *> Sensors;
 
 class TotalUsersSensor : public Sensor {
     public:
 
 class TotalUsersSensor : public Sensor {
     public:

-        TotalUsersSensor(const USERS & u) : users(u) {}
+        explicit TotalUsersSensor(const USERS & u) : users(u) {}

         virtual ~TotalUsersSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
         virtual ~TotalUsersSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {

-        ValueToOS(users.GetUserNum(), objectSyntax);
+        ValueToOS(users.Count(), objectSyntax);

         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const
         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const

-        { std::string res; x2str(users.GetUserNum(), res); return res; }
+        { std::string res; x2str(users.Count(), res); return res; }

 #endif
 
     private:
 #endif
 
     private:


@@ -44,7 +49,7 @@ class TotalUsersSensor : public Sensor {
 
 class UsersSensor : public Sensor {
     public:
 
 class UsersSensor : public Sensor {
     public:

-        UsersSensor(USERS & u) : users(u) {}
+        explicit UsersSensor(USERS & u) : users(u) {}

         virtual ~UsersSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const;
         virtual ~UsersSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const;


@@ -60,7 +65,7 @@ class UsersSensor : public Sensor {
 
 class ConnectedUsersSensor : public UsersSensor {
     public:
 
 class ConnectedUsersSensor : public UsersSensor {
     public:

-        ConnectedUsersSensor(USERS & u) : UsersSensor(u) {}
+        explicit ConnectedUsersSensor(USERS & u) : UsersSensor(u) {}

         virtual ~ConnectedUsersSensor() {}
 
     private:
         virtual ~ConnectedUsersSensor() {}
 
     private:


@@ -70,7 +75,7 @@ class ConnectedUsersSensor : public UsersSensor {
 
 class AuthorizedUsersSensor : public UsersSensor {
     public:
 
 class AuthorizedUsersSensor : public UsersSensor {
     public:

-        AuthorizedUsersSensor(USERS & u) : UsersSensor(u) {}
+        explicit AuthorizedUsersSensor(USERS & u) : UsersSensor(u) {}

         virtual ~AuthorizedUsersSensor() {}
 
     private:
         virtual ~AuthorizedUsersSensor() {}
 
     private:


@@ -80,7 +85,7 @@ class AuthorizedUsersSensor : public UsersSensor {
 
 class AlwaysOnlineUsersSensor : public UsersSensor {
     public:
 
 class AlwaysOnlineUsersSensor : public UsersSensor {
     public:

-        AlwaysOnlineUsersSensor(USERS & u) : UsersSensor(u) {}
+        explicit AlwaysOnlineUsersSensor(USERS & u) : UsersSensor(u) {}

         virtual ~AlwaysOnlineUsersSensor() {}
 
     private:
         virtual ~AlwaysOnlineUsersSensor() {}
 
     private:


@@ -90,7 +95,7 @@ class AlwaysOnlineUsersSensor : public UsersSensor {
 
 class NoCashUsersSensor : public UsersSensor {
     public:
 
 class NoCashUsersSensor : public UsersSensor {
     public:

-        NoCashUsersSensor(USERS & u) : UsersSensor(u) {}
+        explicit NoCashUsersSensor(USERS & u) : UsersSensor(u) {}

         virtual ~NoCashUsersSensor() {}
 
     private:
         virtual ~NoCashUsersSensor() {}
 
     private:


@@ -100,7 +105,7 @@ class NoCashUsersSensor : public UsersSensor {
 
 class DisabledDetailStatsUsersSensor : public UsersSensor {
     public:
 
 class DisabledDetailStatsUsersSensor : public UsersSensor {
     public:

-        DisabledDetailStatsUsersSensor(USERS & u) : UsersSensor(u) {}
+        explicit DisabledDetailStatsUsersSensor(USERS & u) : UsersSensor(u) {}

         virtual ~DisabledDetailStatsUsersSensor() {}
 
     private:
         virtual ~DisabledDetailStatsUsersSensor() {}
 
     private:


@@ -110,7 +115,7 @@ class DisabledDetailStatsUsersSensor : public UsersSensor {
 
 class DisabledUsersSensor : public UsersSensor {
     public:
 
 class DisabledUsersSensor : public UsersSensor {
     public:

-        DisabledUsersSensor(USERS & u) : UsersSensor(u) {}
+        explicit DisabledUsersSensor(USERS & u) : UsersSensor(u) {}

         virtual ~DisabledUsersSensor() {}
 
     private:
         virtual ~DisabledUsersSensor() {}
 
     private:


@@ -120,7 +125,7 @@ class DisabledUsersSensor : public UsersSensor {
 
 class PassiveUsersSensor : public UsersSensor {
     public:
 
 class PassiveUsersSensor : public UsersSensor {
     public:

-        PassiveUsersSensor(USERS & u) : UsersSensor(u) {}
+        explicit PassiveUsersSensor(USERS & u) : UsersSensor(u) {}

         virtual ~PassiveUsersSensor() {}
 
     private:
         virtual ~PassiveUsersSensor() {}
 
     private:


@@ -130,7 +135,7 @@ class PassiveUsersSensor : public UsersSensor {
 
 class CreditUsersSensor : public UsersSensor {
     public:
 
 class CreditUsersSensor : public UsersSensor {
     public:

-        CreditUsersSensor(USERS & u) : UsersSensor(u) {}
+        explicit CreditUsersSensor(USERS & u) : UsersSensor(u) {}

         virtual ~CreditUsersSensor() {}
 
     private:
         virtual ~CreditUsersSensor() {}
 
     private:


@@ -140,7 +145,7 @@ class CreditUsersSensor : public UsersSensor {
 
 class FreeMbUsersSensor : public UsersSensor {
     public:
 
 class FreeMbUsersSensor : public UsersSensor {
     public:

-        FreeMbUsersSensor(USERS & u) : UsersSensor(u) {}
+        explicit FreeMbUsersSensor(USERS & u) : UsersSensor(u) {}

         virtual ~FreeMbUsersSensor() {}
 
     private:
         virtual ~FreeMbUsersSensor() {}
 
     private:


@@ -150,28 +155,37 @@ class FreeMbUsersSensor : public UsersSensor {
 
 class TariffChangeUsersSensor : public UsersSensor {
     public:
 
 class TariffChangeUsersSensor : public UsersSensor {
     public:

-        TariffChangeUsersSensor(USERS & u) : UsersSensor(u) {}
+        explicit TariffChangeUsersSensor(USERS & u) : UsersSensor(u) {}

         virtual ~TariffChangeUsersSensor() {}
 
     private:
         bool UserPredicate(USER_PTR userPtr) const
         virtual ~TariffChangeUsersSensor() {}
 
     private:
         bool UserPredicate(USER_PTR userPtr) const

-        { return userPtr->GetProperty().nextTariff.ConstData().empty(); }
+        { return !userPtr->GetProperty().nextTariff.ConstData().empty(); }
+};
+
+class ActiveUsersSensor : public UsersSensor {
+    public:
+        explicit ActiveUsersSensor(USERS & u) : UsersSensor(u) {}
+        virtual ~ActiveUsersSensor() {}
+
+    private:
+        bool UserPredicate(USER_PTR userPtr) const;

 };
 
 class TotalTariffsSensor : public Sensor {
     public:
 };
 
 class TotalTariffsSensor : public Sensor {
     public:

-        TotalTariffsSensor(const TARIFFS & t) : tariffs(t) {}
+        explicit TotalTariffsSensor(const TARIFFS & t) : tariffs(t) {}

         virtual ~TotalTariffsSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
         virtual ~TotalTariffsSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {

-        ValueToOS(tariffs.GetTariffsNum(), objectSyntax);
+        ValueToOS(tariffs.Count(), objectSyntax);

         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const
         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const

-        { std::string res; x2str(tariffs.GetTariffsNum(), res); return res; }
+        { std::string res; x2str(tariffs.Count(), res); return res; }

 #endif
 
     private:
 #endif
 
     private:


@@ -180,18 +194,18 @@ class TotalTariffsSensor : public Sensor {
 
 class TotalAdminsSensor : public Sensor {
     public:
 
 class TotalAdminsSensor : public Sensor {
     public:

-        TotalAdminsSensor(const ADMINS & a) : admins(a) {}
+        explicit TotalAdminsSensor(const ADMINS & a) : admins(a) {}

         virtual ~TotalAdminsSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
         virtual ~TotalAdminsSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {

-        ValueToOS(admins.GetAdminsNum(), objectSyntax);
+        ValueToOS(admins.Count(), objectSyntax);

         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const
         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const

-        { std::string res; x2str(admins.GetAdminsNum(), res); return res; }
+        { std::string res; x2str(admins.Count(), res); return res; }

 #endif
 
     private:
 #endif
 
     private:


@@ -200,18 +214,18 @@ class TotalAdminsSensor : public Sensor {
 
 class TotalServicesSensor : public Sensor {
     public:
 
 class TotalServicesSensor : public Sensor {
     public:

-        TotalServicesSensor(const SERVICES & s) : services(s) {}
+        explicit TotalServicesSensor(const SERVICES & s) : services(s) {}

         virtual ~TotalServicesSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
         virtual ~TotalServicesSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {

-        ValueToOS(services.GetServicesNum(), objectSyntax);
+        ValueToOS(services.Count(), objectSyntax);

         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const
         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const

-        { std::string res; x2str(services.GetServicesNum(), res); return res; }
+        { std::string res; x2str(services.Count(), res); return res; }

 #endif
 
     private:
 #endif
 
     private:


@@ -220,28 +234,48 @@ class TotalServicesSensor : public Sensor {
 
 class TotalCorporationsSensor : public Sensor {
     public:
 
 class TotalCorporationsSensor : public Sensor {
     public:

-        TotalCorporationsSensor(const CORPORATIONS & c) : corporations(c) {}
+        explicit TotalCorporationsSensor(const CORPORATIONS & c) : corporations(c) {}

         virtual ~TotalCorporationsSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {
         virtual ~TotalCorporationsSensor() {}
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const
         {

-        ValueToOS(corporations.GetCorporationsNum(), objectSyntax);
+        ValueToOS(corporations.Count(), objectSyntax);

         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const
         return true;
         }
 
 #ifdef DEBUG
         std::string ToString() const

-        { std::string res; x2str(services.GetCorporationsNum(), res); return res; }
+        { std::string res; x2str(corporations.Count(), res); return res; }

 #endif
 
     private:
         const CORPORATIONS & corporations;
 };
 
 #endif
 
     private:
         const CORPORATIONS & corporations;
 };
 

+class TotalRulesSensor : public Sensor {
+    public:
+        explicit TotalRulesSensor(const TRAFFCOUNTER & t) : traffcounter(t) {}
+        virtual ~TotalRulesSensor() {}
+
+        bool GetValue(ObjectSyntax_t * objectSyntax) const
+        {
+        ValueToOS(traffcounter.RulesCount(), objectSyntax);
+        return true;
+        }
+
+#ifdef DEBUG
+        std::string ToString() const
+        { std::string res; x2str(traffcounter.RulesCount(), res); return res; }
+#endif
+
+    private:
+        const TRAFFCOUNTER & traffcounter;
+};
+

 template <typename T>
 class ConstSensor : public Sensor {
     public:
 template <typename T>
 class ConstSensor : public Sensor {
     public:

-        ConstSensor(const T & v) : value(v) {}
+        explicit ConstSensor(const T & v) : value(v) {}

         virtual ~ConstSensor() {}
 
         bool GetValue(ObjectSyntax * objectSyntax) const
         virtual ~ConstSensor() {}
 
         bool GetValue(ObjectSyntax * objectSyntax) const


@@ -256,11 +290,13 @@ class ConstSensor : public Sensor {
         T value;
 };
 
         T value;
 };
 

+#ifdef DEBUG

 template <>
 inline
 std::string ConstSensor<std::string>::ToString() const
 {
 return value;
 }
 template <>
 inline
 std::string ConstSensor<std::string>::ToString() const
 {
 return value;
 }

+#endif

 
 #endif
 
 #endif