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

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

diff --git a/projects/sgconf/request.h b/projects/sgconf/request.h
index dbd7d6db434965cdf022b6867ab8b7687295a2ec..6122212732aa5206359a6eb8342c717de401c61a 100644 (file)
--- a/projects/sgconf/request.h
+++ b/projects/sgconf/request.h
@@ -32,9 +32,10 @@
 #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)
@@ -46,6 +47,10 @@ struct REQUEST
 {
 
 REQUEST()
+    : chgTariff(false),
+      createUser(false),
+      deleteUser(false),
+      authBy(false)
 {
     for (int i = 0; i < DIR_NUM; i++)
         {
@@ -55,9 +60,6 @@ REQUEST()
 
     for (int i = 0; i < USERDATA_NUM; i++)
         ud[i].reset();
-
-    createUser = false;
-    deleteUser = false;
 }
 
 RESETABLE<string>   server;
@@ -74,9 +76,11 @@ RESETABLE<double>   setCash;
 string              message;
 bool                createUser;
 bool                deleteUser;
+bool                authBy;
 
 RESETABLE<string>   usrMsg;
 RESETABLE<double>   credit;
+RESETABLE<time_t>   creditExpire;
 RESETABLE<string>   usrPasswd;
 RESETABLE<bool>     down;
 RESETABLE<bool>     passive;