Fix funtests to work with the new build system.

[stg.git] / include / stg / tariff.h

diff --git a/include/stg/tariff.h b/include/stg/tariff.h
index 4f36e6f85522098bab767d5d823f0681995b5728..6f9d87679f8219d36713dc9e41f480b31f6e78ad 100644 (file)
--- a/include/stg/tariff.h
+++ b/include/stg/tariff.h
@@ -21,12 +21,11 @@
 #ifndef TARIFF_H
 #define TARIFF_H
 
 #ifndef TARIFF_H
 #define TARIFF_H
 

-#include "os_int.h"
-

 #include <string>
 #include <string>

+#include <istream>

 #include <cstring>
 #include <ctime>
 #include <cstring>
 #include <ctime>

-#include <istream>
+#include <cstdint>

 
 struct TARIFF_DATA;
 
 
 struct TARIFF_DATA;
 


@@ -38,7 +37,7 @@ public:
 
     enum TRAFF_TYPE { TRAFF_UP = 0, TRAFF_DOWN, TRAFF_UP_DOWN, TRAFF_MAX };
 
 
     enum TRAFF_TYPE { TRAFF_UP = 0, TRAFF_DOWN, TRAFF_UP_DOWN, TRAFF_MAX };
 

-    static std::string ChangePolicyToString(CHANGE_POLICY change_policy);
+    static std::string ChangePolicyToString(CHANGE_POLICY changePolicy);

     static CHANGE_POLICY StringToChangePolicy(const std::string& value);
 
     static std::string PeriodToString(PERIOD period);
     static CHANGE_POLICY StringToChangePolicy(const std::string& value);
 
     static std::string PeriodToString(PERIOD period);


@@ -58,7 +57,8 @@ public:
     virtual double  GetFee() const = 0;
     virtual double  GetFree() const = 0;
     virtual PERIOD  GetPeriod() const = 0;
     virtual double  GetFee() const = 0;
     virtual double  GetFree() const = 0;
     virtual PERIOD  GetPeriod() const = 0;

-    virtual CHANGE_POLICY  GetChangePolicy() const = 0;
+    virtual CHANGE_POLICY GetChangePolicy() const = 0;
+    virtual time_t  GetChangePolicyTimeout() const = 0;

 
     virtual const   std::string & GetName() const = 0;
     virtual void    SetName(const std::string & name) = 0;
 
     virtual const   std::string & GetName() const = 0;
     virtual void    SetName(const std::string & name) = 0;


@@ -67,8 +67,34 @@ public:
     virtual int64_t GetTraffByType(uint64_t up, uint64_t down) const = 0;
     virtual int     GetThreshold(int dir) const = 0;
     virtual const TARIFF_DATA & GetTariffData() const = 0;
     virtual int64_t GetTraffByType(uint64_t up, uint64_t down) const = 0;
     virtual int     GetThreshold(int dir) const = 0;
     virtual const TARIFF_DATA & GetTariffData() const = 0;

+    virtual std::string TariffChangeIsAllowed(const TARIFF & to, time_t currentTime) const = 0;

 };
 
 };
 

+inline
+std::string TARIFF::ChangePolicyToString(TARIFF::CHANGE_POLICY changePolicy)
+{
+switch (changePolicy)
+    {
+    case ALLOW: return "allow";
+    case TO_CHEAP: return "to_cheap";
+    case TO_EXPENSIVE: return "to_expensive";
+    case DENY: return "deny";
+    }
+return "allow"; // Classic behaviour.
+}
+
+inline
+TARIFF::CHANGE_POLICY TARIFF::StringToChangePolicy(const std::string& value)
+{
+if (strcasecmp(value.c_str(), "to_cheap") == 0)
+    return TO_CHEAP;
+if (strcasecmp(value.c_str(), "to_expensive") == 0)
+    return TO_EXPENSIVE;
+if (strcasecmp(value.c_str(), "deny") == 0)
+    return DENY;
+return ALLOW; // Classic behaviour.
+}
+

 inline
 std::string TARIFF::PeriodToString(TARIFF::PERIOD period)
 {
 inline
 std::string TARIFF::PeriodToString(TARIFF::PERIOD period)
 {