Merge remote-tracking branch 'origin/stg-2.409' into ticket37

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

diff --git a/projects/sgconf/common_sg.h b/projects/sgconf/common_sg.h
index 87b8509b4e2e4ec4e962c29bfa76749fd86ab8cc..a5cbffad86289f16be34308ad61f6e1575346932 100644 (file)
--- a/projects/sgconf/common_sg.h
+++ b/projects/sgconf/common_sg.h
@@ -28,12 +28,11 @@
 #ifndef COMMON_SG_H
 #define COMMON_SG_H
 
 #ifndef COMMON_SG_H
 #define COMMON_SG_H
 

+#include <string>
+

 #include "stg/servconf.h"
 #include "stg/servconf.h"

-#include "stg/servconf_types.h"

 #include "request.h"
 
 #include "request.h"
 

-#include <string>
-

 void UsageConf();
 void UsageInfo();
 
 void UsageConf();
 void UsageInfo();
 


@@ -46,27 +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);
 
 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,
                    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 & str);
+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 & requestString);
+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
 
 #endif

+