Add new unit test - checking fee charging rules

[stg.git] / projects / sgconf / request.h

diff --git a/projects/sgconf/request.h b/projects/sgconf/request.h
index dbd7d6db434965cdf022b6867ab8b7687295a2ec..daddec1d3401f6d2eec33d1a2678a98823bd922a 100644 (file)
--- a/projects/sgconf/request.h
+++ b/projects/sgconf/request.h
@@ -32,9 +32,10 @@
 #define request_h
 
 #include <string>
 #define request_h
 
 #include <string>

-#include "resetable.h"
-#include "stg_const.h"
-#include "os_int.h"
+
+#include "stg/resetable.h"
+#include "stg/const.h"
+#include "stg/os_int.h"

 
 #define TARIFF_NOW  (0)
 #define TARIFF_DEL  (1)
 
 #define TARIFF_NOW  (0)
 #define TARIFF_DEL  (1)


@@ -46,6 +47,9 @@ struct REQUEST
 {
 
 REQUEST()
 {
 
 REQUEST()

+    : chgTariff(false),
+      createUser(false),
+      deleteUser(false)

 {
     for (int i = 0; i < DIR_NUM; i++)
         {
 {
     for (int i = 0; i < DIR_NUM; i++)
         {


@@ -55,9 +59,6 @@ REQUEST()
 
     for (int i = 0; i < USERDATA_NUM; i++)
         ud[i].reset();
 
     for (int i = 0; i < USERDATA_NUM; i++)
         ud[i].reset();

-
-    createUser = false;
-    deleteUser = false;

 }
 
 RESETABLE<string>   server;
 }
 
 RESETABLE<string>   server;


@@ -77,6 +78,7 @@ bool                deleteUser;
 
 RESETABLE<string>   usrMsg;
 RESETABLE<double>   credit;
 
 RESETABLE<string>   usrMsg;
 RESETABLE<double>   credit;

+RESETABLE<time_t>   creditExpire;

 RESETABLE<string>   usrPasswd;
 RESETABLE<bool>     down;
 RESETABLE<bool>     passive;
 RESETABLE<string>   usrPasswd;
 RESETABLE<bool>     down;
 RESETABLE<bool>     passive;