Simplified parser interfaces.

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

diff --git a/projects/sgconf/common_sg.h b/projects/sgconf/common_sg.h
index d36ed750b6c53163e7a65ca99a0dea90a3747721..87b8509b4e2e4ec4e962c29bfa76749fd86ab8cc 100644 (file)
--- a/projects/sgconf/common_sg.h
+++ b/projects/sgconf/common_sg.h
@@ -28,11 +28,12 @@
 #ifndef COMMON_SG_H
 #define COMMON_SG_H
 
-#include <string>
-
-#include "servconf.h"
+#include "stg/servconf.h"
+#include "stg/servconf_types.h"
 #include "request.h"
 
+#include <string>
+
 void UsageConf();
 void UsageInfo();
 
@@ -45,20 +46,27 @@ int CheckLogin(const char * login);
 void ConvertFromKOI8(const std::string & src, std::string * dst);
 void ConvertToKOI8(const std::string & src, std::string * dst);
 
-int ProcessGetUser(const std::string &server,
-                   int port,
-                   const std::string &admLogin,
-                   const std::string &admPasswd,
-                   const std::string &login,
-                   void * data);
+bool ProcessGetUser(const std::string & server,
+                    int port,
+                    const std::string & admLogin,
+                    const std::string & admPasswd,
+                    const std::string & login,
+                    REQUEST & request);
 
-int ProcessSetUser(const std::string &server,
+bool ProcessAuthBy(const std::string & server,
                    int port,
-                   const std::string &admLogin,
-                   const std::string &admPasswd,
-                   const std::string &str,
-                   void * data,
-                   bool isMessage = false);
+                   const std::string & admLogin,
+                   const std::string & admPasswd,
+                   const std::string & login);
 
-#endif
+bool ProcessSetUser(const std::string & server,
+                    int port,
+                    const std::string & admLogin,
+                    const std::string & admPasswd,
+                    const std::string & str);
 
+bool ProcessSendMessage(const std::string & server, uint16_t port,
+                        const std::string & login, const std::string & password,
+                        const std::string & requestString);
+
+#endif