X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/474a9dc37f5085103d11cff3afa8642538f06a10..0040c62ef3093af43a5a1b7563fc4b854e56777d:/stglibs/srvconf.lib/include/stg/servconf.h?ds=sidebyside

diff --git a/stglibs/srvconf.lib/include/stg/servconf.h b/stglibs/srvconf.lib/include/stg/servconf.h
index f2afda39..cd37e49e 100644
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -43,13 +43,16 @@ class SERVCONF
 public:
     SERVCONF(const std::string & server, uint16_t port,
              const std::string & login, const std::string & password);
+    SERVCONF(const std::string & server, uint16_t port,
+             const std::string & localAddress, uint16_t localPort,
+             const std::string & login, const std::string & password);
     ~SERVCONF();
 
     int ServerInfo(SERVER_INFO::CALLBACK f, void * data);
 
     int RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data);
 
-    int GetAdmins(GET_ADMINS::CALLBACK f, void * data);
+    int GetAdmins(GET_CONTAINER::CALLBACK<GET_ADMIN::INFO>::TYPE f, void * data);
     int GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data);
     int ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddAdmin(const std::string & login,
@@ -57,7 +60,7 @@ public:
                  SIMPLE::CALLBACK f, void * data);
     int DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data);
 
-    int GetTariffs(GET_TARIFFS::CALLBACK f, void * data);
+    int GetTariffs(GET_CONTAINER::CALLBACK<GET_TARIFF::INFO>::TYPE f, void * data);
     int GetTariff(const std::string & name, GET_TARIFF::CALLBACK f, void * data);
     int ChgTariff(const TARIFF_DATA_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddTariff(const std::string & name,
@@ -65,19 +68,22 @@ public:
                   SIMPLE::CALLBACK f, void * data);
     int DelTariff(const std::string & name, SIMPLE::CALLBACK f, void * data);
 
-    int GetUsers(GET_USERS::CALLBACK f, void * data);
+    int GetUsers(GET_CONTAINER::CALLBACK<GET_USER::INFO>::TYPE f, void * data);
     int GetUser(const std::string & login, GET_USER::CALLBACK f, void * data);
     int ChgUser(const std::string & login,
                 const USER_CONF_RES & conf,
                 const USER_STAT_RES & stat,
                 SIMPLE::CALLBACK f, void * data);
     int DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data);
-    int AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data);
+    int AddUser(const std::string & login,
+                const USER_CONF_RES & conf,
+                const USER_STAT_RES & stat,
+                SIMPLE::CALLBACK f, void * data);
     int AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data);
     int SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data);
     int CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data);
 
-    int GetServices(GET_SERVICES::CALLBACK f, void * data);
+    int GetServices(GET_CONTAINER::CALLBACK<GET_SERVICE::INFO>::TYPE f, void * data);
     int GetService(const std::string & name, GET_SERVICE::CALLBACK f, void * data);
     int ChgService(const SERVICE_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddService(const std::string & name,
@@ -85,7 +91,7 @@ public:
                    SIMPLE::CALLBACK f, void * data);
     int DelService(const std::string & name, SIMPLE::CALLBACK f, void * data);
 
-    int GetCorporations(GET_CORPORATIONS::CALLBACK f, void * data);
+    int GetCorporations(GET_CONTAINER::CALLBACK<GET_CORP::INFO>::TYPE f, void * data);
     int GetCorp(const std::string & name, GET_CORP::CALLBACK f, void * data);
     int ChgCorp(const CORP_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);
     int AddCorp(const std::string & name,