Some small changes in srvconf.lib.

[stg.git] / projects / sgconf / tariffs.cpp

diff --git a/projects/sgconf/tariffs.cpp b/projects/sgconf/tariffs.cpp
index a108920f86a2a70dd2486687c654f70c8528e496..3d63d2a8c6861f1b1fc0a666ef4af972ca9f3f69 100644 (file)
--- a/projects/sgconf/tariffs.cpp
+++ b/projects/sgconf/tariffs.cpp
@@ -40,17 +40,17 @@ switch (period)
 return "unknown";
 }
 
 return "unknown";
 }
 

-std::string TraffTypeToString(int traffType)
+std::string TraffTypeToString(TARIFF::TRAFF_TYPE traffType)

 {
 switch (traffType)
     {
 {
 switch (traffType)
     {

-    case TRAFF_UP:
+    case TARIFF::TRAFF_UP:

         return "upload";
         return "upload";

-    case TRAFF_DOWN:
+    case TARIFF::TRAFF_DOWN:

         return "download";
         return "download";

-    case TRAFF_UP_DOWN:
+    case TARIFF::TRAFF_UP_DOWN:

         return "upload + download";
         return "upload + download";

-    case TRAFF_MAX:
+    case TARIFF::TRAFF_MAX:

         return "max(upload, download)";
     }
 return "unknown";
         return "max(upload, download)";
     }
 return "unknown";


@@ -67,18 +67,18 @@ else
     throw SGCONF::ACTION::ERROR("Period should be 'daily' or 'monthly'. Got: '" + value + "'");
 }
 
     throw SGCONF::ACTION::ERROR("Period should be 'daily' or 'monthly'. Got: '" + value + "'");
 }
 

-void ConvTraffType(const std::string & value, RESETABLE<int> & res)
+void ConvTraffType(const std::string & value, RESETABLE<TARIFF::TRAFF_TYPE> & res)

 {
 std::string lowered = ToLower(value);
 lowered.erase(std::remove(lowered.begin(), lowered.end(), ' '), lowered.end());
 if (lowered == "upload")
 {
 std::string lowered = ToLower(value);
 lowered.erase(std::remove(lowered.begin(), lowered.end(), ' '), lowered.end());
 if (lowered == "upload")

-    res = TRAFF_UP;
+    res = TARIFF::TRAFF_UP;

 else if (lowered == "download")
 else if (lowered == "download")

-    res = TRAFF_DOWN;
+    res = TARIFF::TRAFF_DOWN;

 else if (lowered == "upload+download")
 else if (lowered == "upload+download")

-    res = TRAFF_UP_DOWN;
+    res = TARIFF::TRAFF_UP_DOWN;

 else if (lowered.substr(0, 3) == "max")
 else if (lowered.substr(0, 3) == "max")

-    res = TRAFF_MAX;
+    res = TARIFF::TRAFF_MAX;

 else
     throw SGCONF::ACTION::ERROR("Traff type should be 'upload', 'download', 'upload + download' or 'max'. Got: '" + value + "'");
 }
 else
     throw SGCONF::ACTION::ERROR("Traff type should be 'upload', 'download', 'upload + download' or 'max'. Got: '" + value + "'");
 }


@@ -290,6 +290,8 @@ bool GetTariffsFunction(const SGCONF::CONFIG & config,
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),

+                    config.localAddress.data(),
+                    config.localPort.data(),

                     config.userName.data(),
                     config.userPass.data());
 return proto.GetTariffs(GetTariffsCallback, NULL) == STG::st_ok;
                     config.userName.data(),
                     config.userPass.data());
 return proto.GetTariffs(GetTariffsCallback, NULL) == STG::st_ok;


@@ -301,6 +303,8 @@ bool GetTariffFunction(const SGCONF::CONFIG & config,
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),

+                    config.localAddress.data(),
+                    config.localPort.data(),

                     config.userName.data(),
                     config.userPass.data());
 // STG currently doesn't support <GetTariff name="..."/>.
                     config.userName.data(),
                     config.userPass.data());
 // STG currently doesn't support <GetTariff name="..."/>.


@@ -315,6 +319,8 @@ bool DelTariffFunction(const SGCONF::CONFIG & config,
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),
 {
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),

+                    config.localAddress.data(),
+                    config.localPort.data(),

                     config.userName.data(),
                     config.userPass.data());
 return proto.DelTariff(arg, SimpleCallback, NULL) == STG::st_ok;
                     config.userName.data(),
                     config.userPass.data());
 return proto.DelTariff(arg, SimpleCallback, NULL) == STG::st_ok;


@@ -346,6 +352,8 @@ for (size_t i = 0; i < conf.dirPrice.size(); ++i)
     }
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),
     }
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),

+                    config.localAddress.data(),
+                    config.localPort.data(),

                     config.userName.data(),
                     config.userPass.data());
 return proto.AddTariff(arg, conf, SimpleCallback, NULL) == STG::st_ok;
                     config.userName.data(),
                     config.userPass.data());
 return proto.AddTariff(arg, conf, SimpleCallback, NULL) == STG::st_ok;


@@ -377,6 +385,8 @@ for (size_t i = 0; i < conf.dirPrice.size(); ++i)
     }
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),
     }
 STG::SERVCONF proto(config.server.data(),
                     config.port.data(),

+                    config.localAddress.data(),
+                    config.localPort.data(),

                     config.userName.data(),
                     config.userPass.data());
 return proto.ChgTariff(conf, SimpleCallback, NULL) == STG::st_ok;
                     config.userName.data(),
                     config.userPass.data());
 return proto.ChgTariff(conf, SimpleCallback, NULL) == STG::st_ok;