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

[stg.git] / projects / stargazer / tariff_impl.h

diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h
index b8d0a776d729407a206cebe5d5110b1ab99933a6..f2f84d2630889f73432e9a191459c8174c37adf3 100644 (file)
--- a/projects/stargazer/tariff_impl.h
+++ b/projects/stargazer/tariff_impl.h
@@ -46,18 +46,22 @@
 class TARIFF_IMPL : public TARIFF {
 public:
     TARIFF_IMPL()
-        : tariffData()
-    {};
+        : TARIFF(),
+          tariffData()
+    {}
     TARIFF_IMPL(const std::string & name)
-        : tariffData(name)
-    {};
+        : TARIFF(),
+          tariffData(name)
+    {}
     TARIFF_IMPL(const TARIFF_DATA & td)
-        : tariffData(td)
-    {};
+        : TARIFF(),
+          tariffData(td)
+    {}
     TARIFF_IMPL(const TARIFF_IMPL & t)
-        : tariffData(t.tariffData)
-    {};
-    virtual ~TARIFF_IMPL() {};
+        : TARIFF(),
+          tariffData(t.tariffData)
+    {}
+    virtual ~TARIFF_IMPL() {}
 
     double  GetPriceWithTraffType(uint64_t up,
                                   uint64_t down,
@@ -67,6 +71,7 @@ public:
     double  GetPassiveCost() const { return tariffData.tariffConf.passiveCost; }
     double  GetFee() const { return tariffData.tariffConf.fee; }
     double  GetFree() const { return tariffData.tariffConf.free; }
+    PERIOD  GetPeriod() const { return tariffData.tariffConf.period; }
 
     void    Print() const;
 
@@ -78,15 +83,15 @@ public:
     int     GetThreshold(int dir) const;
     const TARIFF_DATA & GetTariffData() const { return tariffData; }
 
-    TARIFF & operator=(const TARIFF_DATA & td);
-    TARIFF & operator=(const TARIFF & t);
-    bool     operator==(const TARIFF & rhs) const { return GetName() == rhs.GetName(); }
-    bool     operator!=(const TARIFF & rhs) const { return GetName() != rhs.GetName(); }
+    TARIFF_IMPL & operator=(const TARIFF_DATA & td);
+    TARIFF_IMPL & operator=(const TARIFF_IMPL & t);
+    bool     operator==(const TARIFF_IMPL & rhs) const { return GetName() == rhs.GetName(); }
+    bool     operator!=(const TARIFF_IMPL & rhs) const { return GetName() != rhs.GetName(); }
 
 private:
     TARIFF_DATA     tariffData;
 
-    double  GetPriceWithoutFreeMb(int dir, int mb, time_t t) const;
+    double  GetPriceWithoutFreeMb(int dir, int64_t mb, time_t t) const;
     int     Interval(int dir, time_t t) const;
 };