Ticket 37. The stgTime argument added in TariffChangeIsAllowed()

[stg.git] / projects / sgconf / common_sg.h

diff --git a/projects/sgconf/common_sg.h b/projects/sgconf/common_sg.h
index 323a8cf8f1dead9d437ef6c2c554af29f4455509..a5cbffad86289f16be34308ad61f6e1575346932 100644 (file)
--- a/projects/sgconf/common_sg.h
+++ b/projects/sgconf/common_sg.h
@@ -28,14 +28,10 @@
 #ifndef COMMON_SG_H
 #define COMMON_SG_H
 
-#include "stg/servconf.h"
-#include "stg/servconf_types.h"
-#include "request.h"
-
 #include <string>
 
-struct USER_CONF_RES;
-struct USER_STAT_RES;
+#include "stg/servconf.h"
+#include "request.h"
 
 void UsageConf();
 void UsageInfo();
@@ -49,29 +45,27 @@ int CheckLogin(const char * login);
 void ConvertFromKOI8(const std::string & src, std::string * dst);
 void ConvertToKOI8(const std::string & src, std::string * dst);
 
-bool ProcessGetUser(const std::string & server,
-                    int port,
-                    const std::string & admLogin,
-                    const std::string & admPasswd,
-                    const std::string & login,
-                    REQUEST & request);
-
-bool ProcessAuthBy(const std::string & server,
+int ProcessGetUser(const std::string &server,
                    int port,
-                   const std::string & admLogin,
-                   const std::string & admPasswd,
-                   const std::string & login);
+                   const std::string &admLogin,
+                   const std::string &admPasswd,
+                   const std::string &login,
+                   void * data);
 
-bool ProcessSetUser(const std::string & server,
-                    int port,
-                    const std::string & admLogin,
-                    const std::string & admPasswd,
-                    const std::string & user,
-                    const USER_CONF_RES & conf,
-                    const USER_STAT_RES & stat);
+int ProcessAuthBy(const std::string &server,
+                  int port,
+                  const std::string &admLogin,
+                  const std::string &admPasswd,
+                  const std::string &login,
+                  void * data);
 
-bool ProcessSendMessage(const std::string & server, uint16_t port,
-                        const std::string & login, const std::string & password,
-                        const std::string & user, const std::string & text);
+int ProcessSetUser(const std::string &server,
+                   int port,
+                   const std::string &admLogin,
+                   const std::string &admPasswd,
+                   const std::string &str,
+                   void * data,
+                   bool isMessage = false);
 
 #endif
+