Merge branch 'log-unauth-reasons'

[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 f46aadb5e80c1647c7456f7eca19a2eb03b8efbf..f323e99e95a96325f10d09b89c2e466d0ba77dc9 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf_types.h
+++ b/stglibs/srvconf.lib/include/stg/servconf_types.h
@@ -39,6 +39,9 @@
 #define  ENC_MSG_LEN    (8)
 
 struct ADMIN_CONF;
+struct TARIFF_DATA;
+struct SERVICE_CONF;
+struct CORP_CONF;
 
 namespace STG
 {
@@ -74,6 +77,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
 {
 
@@ -99,6 +113,13 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 } // namespace SERVER_INFO
 
+namespace RAW_XML
+{
+
+typedef void (* CALLBACK)(bool result, const std::string & reason, const std::string & response, void * data);
+
+}
+
 namespace GET_USER
 {
 
@@ -142,26 +163,34 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 } // namespace GET_USER
 
-namespace GET_USERS
+namespace GET_ADMIN
 {
 
-typedef std::vector<GET_USER::INFO> INFO;
+typedef ADMIN_CONF INFO;
 typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
-} // namespace GET_USERS
+}
 
-namespace GET_ADMIN
+namespace GET_TARIFF
 {
 
-typedef ADMIN_CONF INFO;
+typedef TARIFF_DATA INFO;
+typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
+
+}
+
+namespace GET_SERVICE
+{
+
+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);
 
 }