Merge branch 'naffanya-dev'

[stg.git] / stglibs / srvconf.lib / include / stg / servconf_types.h

diff --git a/stglibs/srvconf.lib/include/stg/servconf_types.h b/stglibs/srvconf.lib/include/stg/servconf_types.h
index 6f454bc365d72d7788065f61018611116dc62a7b..998e3b4747d08e2c02fd1548d743759b2bf74842 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf_types.h
+++ b/stglibs/srvconf.lib/include/stg/servconf_types.h
@@ -21,6 +21,7 @@
 #ifndef __STG_STGLIBS_SRVCONF_TYPES_H__
 #define __STG_STGLIBS_SRVCONF_TYPES_H__
 
+#include "stg/array.h"
 #include "stg/const.h" // DIR_NUM
 #include "stg/os_int.h" // uint32_t, etc...
 
@@ -41,6 +42,7 @@
 struct ADMIN_CONF;
 struct TARIFF_DATA;
 struct SERVICE_CONF;
+struct CORP_CONF;
 
 namespace STG
 {
@@ -76,6 +78,17 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, void * data);
 
 } // namespace SIMPLE
 
+namespace GET_CONTAINER
+{
+
+template <typename INFO>
+struct CALLBACK
+{
+typedef void (* TYPE)(bool result, const std::string & reason, const std::vector<INFO> & info, void * data);
+};
+
+}
+
 namespace AUTH_BY
 {
 
@@ -95,7 +108,7 @@ struct INFO
     int         usersNum;
     std::string uname;
     int         dirNum;
-    std::string dirName[DIR_NUM];
+    ARRAY<std::string, DIR_NUM> dirName;
 };
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
@@ -113,11 +126,10 @@ namespace GET_USER
 
 struct STAT
 {
-    long long  su[DIR_NUM];
-    long long  sd[DIR_NUM];
-    long long  mu[DIR_NUM];
-    long long  md[DIR_NUM];
-    double     freeMb;
+    ARRAY<long long, DIR_NUM> su;
+    ARRAY<long long, DIR_NUM> sd;
+    ARRAY<long long, DIR_NUM> mu;
+    ARRAY<long long, DIR_NUM> md;
 };
 
 struct INFO
@@ -127,9 +139,11 @@ struct INFO
     double      cash;
     double      credit;
     time_t      creditExpire;
-    double      lastCash;
+    double      lastCashAdd;
+    double      lastCashAddTime;
+    time_t      lastTimeCash;
     double      prepaidTraff;
-    int         down;
+    int         disabled;
     int         passive;
     int         disableDetailStat;
     int         connected;
@@ -143,22 +157,19 @@ struct INFO
     std::string name;
     std::string address;
     std::string phone;
+    std::string corp;
     STAT        stat;
-    std::string userData[USERDATA_NUM];
+    time_t      pingTime;
+    time_t      lastActivityTime;
+    ARRAY<std::string, USERDATA_NUM> userData;
+    std::vector<std::string> services;
+    std::vector<std::string> authBy;
 };
 
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 } // namespace GET_USER
 
-namespace GET_USERS
-{
-
-typedef std::vector<GET_USER::INFO> INFO;
-typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
-
-} // namespace GET_USERS
-
 namespace GET_ADMIN
 {
 
@@ -167,14 +178,6 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 }
 
-namespace GET_ADMINS
-{
-
-typedef std::vector<GET_ADMIN::INFO> INFO;
-typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
-
-}
-
 namespace GET_TARIFF
 {
 
@@ -183,14 +186,6 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 }
 
-namespace GET_TARIFFS
-{
-
-typedef std::vector<GET_TARIFF::INFO> INFO;
-typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
-
-}
-
 namespace GET_SERVICE
 {
 
@@ -199,10 +194,10 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 }
 
-namespace GET_SERVICES
+namespace GET_CORP
 {
 
-typedef std::vector<GET_SERVICE::INFO> INFO;
+typedef CORP_CONF INFO;
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 }