Merge branch 'new-daily-fee'

[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 09f9b9702eb6419441114e49deb411ab0fcef8c8..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
 {
@@ -67,7 +70,23 @@ confLoginCipher,
 confData
 };
 
-typedef void (* SIMPLE_CALLBACK)(bool result, const std::string & reason, void * data);
+namespace SIMPLE
+{
+
+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,12 +113,12 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 } // namespace SERVER_INFO
 
-namespace CHECK_USER
+namespace RAW_XML
 {
 
-typedef SIMPLE_CALLBACK CALLBACK;
+typedef void (* CALLBACK)(bool result, const std::string & reason, const std::string & response, void * data);
 
-} // namespace CHECK_USER
+}
 
 namespace GET_USER
 {
@@ -144,28 +163,6 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 } // 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 CHG_USER
-{
-
-typedef SIMPLE_CALLBACK CALLBACK;
-
-}
-
-namespace SEND_MESSAGE
-{
-
-typedef SIMPLE_CALLBACK CALLBACK;
-
-}
-
 namespace GET_ADMIN
 {
 
@@ -174,32 +171,27 @@ 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 ADD_ADMIN
-{
-
-typedef SIMPLE_CALLBACK CALLBACK;
-
-}
-
-namespace DEL_ADMIN
+namespace GET_SERVICE
 {
 
-typedef SIMPLE_CALLBACK CALLBACK;
+typedef SERVICE_CONF INFO;
+typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 }
 
-namespace CHG_ADMIN
+namespace GET_CORP
 {
 
-typedef SIMPLE_CALLBACK CALLBACK;
+typedef CORP_CONF INFO;
+typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO & info, void * data);
 
 }