Implemented some user management functions.

[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 4c0e59273b57c9cac236041c1be01044e03f04a5..3fd1c7c57a26d771ae8ab1c47560db83f16982a5 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...
 
@@ -40,6 +41,8 @@
 
 struct ADMIN_CONF;
 struct TARIFF_DATA;
+struct SERVICE_CONF;
+struct CORP_CONF;
 
 namespace STG
 {
@@ -75,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
 {
 
@@ -94,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);
 
@@ -112,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
@@ -143,21 +157,13 @@ struct INFO
     std::string address;
     std::string phone;
     STAT        stat;
-    std::string userData[USERDATA_NUM];
+    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
-{
-
-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
 {
 
@@ -166,26 +172,26 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 }
 
-namespace GET_ADMINS
+namespace GET_TARIFF
 {
 
-typedef std::vector<GET_ADMIN::INFO> INFO;
+typedef TARIFF_DATA INFO;
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 }
 
-namespace GET_TARIFF
+namespace GET_SERVICE
 {
 
-typedef TARIFF_DATA INFO;
+typedef SERVICE_CONF INFO;
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 }
 
-namespace GET_TARIFFS
+namespace GET_CORP
 {
 
-typedef std::vector<GET_TARIFF::INFO> INFO;
+typedef CORP_CONF INFO;
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 }