Moved CHG_USER and SEND_MESSAGE parsers from global scope.

[stg.git] / projects / sgconf / main.cpp

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index 507abaa53a75fdff60c003845256e43508dbca0f..2c2a8a7b2168640034741d9f1d4ffebbe41a4335 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -34,11 +34,9 @@
 #include <cstdio>
 #include <cstring>
 #include <string>
 #include <cstdio>
 #include <cstring>
 #include <string>

-#include <list>

 #include <sstream>
 
 #include "stg/common.h"
 #include <sstream>
 
 #include "stg/common.h"

-#include "stg/netunit.h"

 #include "request.h"
 #include "common_sg.h"
 #include "sg_error_codes.h"
 #include "request.h"
 #include "common_sg.h"
 #include "sg_error_codes.h"


@@ -75,9 +73,6 @@ return true;
 
 time_t stgTime;
 
 
 time_t stgTime;
 

-int ParseReplyGet(void * data, list<string> * ans);
-//int ParseReplySet(void * data, list<string> * ans);
-

 struct option long_options_get[] = {
 {"server",      1, 0, 's'},  //Server
 {"port",        1, 0, 'p'},  //Port
 struct option long_options_get[] = {
 {"server",      1, 0, 's'},  //Server
 {"port",        1, 0, 'p'},  //Port


@@ -724,7 +719,7 @@ int CheckParametersSet(REQUEST * req)
 return CheckParameters(req);
 }
 //-----------------------------------------------------------------------------
 return CheckParameters(req);
 }
 //-----------------------------------------------------------------------------

-int mainGet(int argc, char **argv)
+bool mainGet(int argc, char **argv)

 {
 int c;
 REQUEST req;
 {
 int c;
 REQUEST req;


@@ -885,12 +880,12 @@ if (missedOptionArg || !CheckParametersGet(&req))
     }
 
 if (req.authBy)
     }
 
 if (req.authBy)

-    return ProcessAuthBy(req.server, req.port, req.admLogin, req.admPasswd, req.login, req);
+    return ProcessAuthBy(req.server, req.port, req.admLogin, req.admPasswd, req.login);

 else
     return ProcessGetUser(req.server, req.port, req.admLogin, req.admPasswd, req.login, req);
 }
 //-----------------------------------------------------------------------------
 else
     return ProcessGetUser(req.server, req.port, req.admLogin, req.admPasswd, req.login, req);
 }
 //-----------------------------------------------------------------------------

-int mainSet(int argc, char **argv)
+bool mainSet(int argc, char **argv)

 {
 string str;
 
 {
 string str;
 


@@ -1087,7 +1082,10 @@ char rstr[rLen];
 memset(rstr, 0, rLen);
 
 CreateRequestSet(&req, rstr);
 memset(rstr, 0, rLen);
 
 CreateRequestSet(&req, rstr);

-return ProcessSetUser(req.server, req.port, req.admLogin, req.admPasswd, rstr, NULL, isMessage);
+if (isMessage)
+    return ProcessSendMessage(req.server, req.port, req.admLogin, req.admPasswd, rstr);
+
+return ProcessSetUser(req.server, req.port, req.admLogin, req.admPasswd, rstr);

 }
 //-----------------------------------------------------------------------------
 int main(int argc, char **argv)
 }
 //-----------------------------------------------------------------------------
 int main(int argc, char **argv)


@@ -1106,7 +1104,9 @@ if (strcmp(argv[1], "get") == 0)
 else if (strcmp(argv[1], "set") == 0)
     {
     //printf("set\n");
 else if (strcmp(argv[1], "set") == 0)
     {
     //printf("set\n");

-    return mainSet(argc - 1, argv + 1);
+    if (mainSet(argc - 1, argv + 1) )
+        return 0;
+    return -1;

     }
 else
     {
     }
 else
     {