X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/cad325f5f0516da6b1d1d44c509ce194e2f08f46..5a98249bfadbe1d22d316dc3e9e770e0c305e5d6:/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 86df8e95..22172506 100644
--- 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...
 
@@ -39,6 +40,9 @@
 #define  ENC_MSG_LEN    (8)
 
 struct ADMIN_CONF;
+struct TARIFF_DATA;
+struct SERVICE_CONF;
+struct CORP_CONF;
 
 namespace STG
 {
@@ -74,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
 {
 
@@ -93,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);
 
@@ -111,11 +126,11 @@ 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;
+    double freeMb;
 };
 
 struct INFO
@@ -126,8 +141,9 @@ struct INFO
     double      credit;
     time_t      creditExpire;
     double      lastCash;
+    time_t      lastTimeCash;
     double      prepaidTraff;
-    int         down;
+    int         disabled;
     int         passive;
     int         disableDetailStat;
     int         connected;
@@ -142,33 +158,43 @@ struct INFO
     std::string address;
     std::string phone;
     STAT        stat;
-    std::string userData[USERDATA_NUM];
+    time_t      pingTime;
+    time_t      lastActivityTime;
+    ARRAY<std::string, USERDATA_NUM> userData;
 };
 
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 } // namespace GET_USER
 
-namespace GET_USERS
+namespace GET_ADMIN
+{
+
+typedef ADMIN_CONF INFO;
+typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
+
+}
+
+namespace GET_TARIFF
 {
 
-typedef std::vector<GET_USER::INFO> INFO;
+typedef TARIFF_DATA INFO;
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
-} // namespace GET_USERS
+}
 
-namespace GET_ADMIN
+namespace GET_SERVICE
 {
 
-typedef ADMIN_CONF INFO;
+typedef SERVICE_CONF INFO;
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 }
 
-namespace GET_ADMINS
+namespace GET_CORP
 {
 
-typedef std::vector<GET_ADMIN::INFO> INFO;
+typedef CORP_CONF INFO;
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 }