*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <locale.h>
-#include <langinfo.h>
-#include <iostream>
-#include <iconv.h>
-
-#include "stg/common.h"
#include "sg_error_codes.h"
#include "common_sg.h"
#include "version_sg.h"
-using namespace std;
+#include "stg/common.h"
+
+#include <iostream>
+#include <vector>
+
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <cerrno>
+#include <clocale>
+
+#include <langinfo.h>
+#include <iconv.h>
const int usageConf = 0;
const int usageInfo = 1;
const int TO_KOI8 = 0;
const int FROM_KOI8 = 1;
//-----------------------------------------------------------------------------
+struct ResultData
+{
+ bool result;
+ std::string reason;
+};
+//-----------------------------------------------------------------------------
struct GetUserData
{
GetUserData(REQUEST & req, bool res) : request(req), result(res) {}
REQUEST & request;
bool result;
+ std::string reason;
};
//---------------------------------------------------------------------------
struct HelpParams
{
- string setActionName;
- string getActionName;
- string valueName;
- string valueParam;
+ std::string setActionName;
+ std::string getActionName;
+ std::string valueName;
+ std::string valueParam;
};
//---------------------------------------------------------------------------
void Usage(int usageType)
int port;
if (str2x(p, port) != 0)
{
- printf("Incorresct server port %s\n", p);
+ printf("Incorrect server port %s\n", p);
exit(NETWORK_ERR_CODE);
}
return (short)port;
{
if (CheckLogin(adm))
{
- printf("Incorresct admin login %s\n", adm);
+ printf("Incorrect admin login %s\n", adm);
exit(PARAMETER_PARSING_ERR_CODE);
}
return adm;
{
if (CheckLogin(usr))
{
- printf("Incorresct user login %s\n", usr);
+ printf("Incorrect user login %s\n", usr);
exit(PARAMETER_PARSING_ERR_CODE);
}
return usr;
}
//-----------------------------------------------------------------------------
-void ConvertKOI8(const string & src, string * dst, int encType)
+void ConvertKOI8(const std::string & src, std::string * dst, int encType)
{
iconv_t cd;
char * ob = new char[src.size() * 2 + 1];
delete[] ib;
}
//-----------------------------------------------------------------------------
-void ConvertFromKOI8(const string & src, string * dst)
+void ConvertFromKOI8(const std::string & src, std::string * dst)
{
ConvertKOI8(src, dst, FROM_KOI8);
}
//-----------------------------------------------------------------------------
-void ConvertToKOI8(const string & src, string * dst)
+void ResultCallback(bool result, const std::string & reason, void * d)
{
-ConvertKOI8(src, dst, TO_KOI8);
+ResultData * data = static_cast<ResultData *>(d);
+data->result = result;
+data->reason = reason;
}
//-----------------------------------------------------------------------------
-int RecvSetUserAnswer(const char * ans, void * d)
+void RecvAuthByData(bool result, const std::string & reason,
+ const PARSER_AUTH_BY::INFO & list, void * d)
{
-GetUserData * data = static_cast<GetUserData *>(d);
+ResultData * data = static_cast<ResultData *>(d);
+data->result = result;
+data->reason = reason;
-data->result = (strcasecmp("Ok", ans) == 0);
+if (!result)
+ return;
-return 0;
+for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
+ std::cout << *it << "\n";
+
+std::cout << std::endl;
}
//-----------------------------------------------------------------------------
struct StringReqParams
{
- string name;
- RESETABLE<string> reqParam;
- const string * value;
+ std::string name;
+ RESETABLE<std::string> reqParam;
+ const std::string * value;
};
//-----------------------------------------------------------------------------
-void GetUserCallback(const PARSER_GET_USER::INFO & info, void * d)
+void GetUserCallback(bool result, const std::string& reason, const PARSER_GET_USER::INFO & info, void * d)
{
GetUserData * data = static_cast<GetUserData *>(d);
+data->result = false;
+data->reason = reason;
+
+if (!result)
+ return;
if (info.login == "")
{
data->result = false;
+ data->reason = "Invalid login.";
return;
}
if (!data->request.cash.res_empty())
- cout << "cash=" << info.cash << endl;
+ cout << "cash = " << info.cash << endl;
if (!data->request.credit.res_empty())
- cout << "credit=" << info.credit << endl;
+ cout << "credit = " << info.credit << endl;
if (!data->request.creditExpire.res_empty())
{
strftime(buf, 32, "%Y-%m-%d", &brokenTime);
- cout << "creditExpire=" << buf << endl;
+ cout << "creditExpire = " << buf << endl;
}
if (!data->request.down.res_empty())
- cout << "down=" << info.down << endl;
+ cout << "down = " << info.down << endl;
if (!data->request.passive.res_empty())
- cout << "passive=" << info.passive << endl;
+ cout << "passive = " << info.passive << endl;
if (!data->request.disableDetailStat.res_empty())
- cout << "disableDetailStat=" << info.disableDetailStat << endl;
+ cout << "disableDetailStat = " << info.disableDetailStat << endl;
if (!data->request.alwaysOnline.res_empty())
- cout << "alwaysOnline=" << info.alwaysOnline << endl;
+ cout << "alwaysOnline = " << info.alwaysOnline << endl;
if (!data->request.prepaidTraff.res_empty())
- cout << "prepaidTraff=" << info.prepaidTraff << endl;
+ cout << "prepaidTraff = " << info.prepaidTraff << endl;
for (int i = 0; i < DIR_NUM; i++)
{
if (!data->request.sessionUpload[i].res_empty())
- cout << "session upload for dir" << i << "=" << info.stat.su[i] << endl;
+ cout << "session upload for dir " << i << " = " << info.stat.su[i] << endl;
if (!data->request.sessionDownload[i].res_empty())
- cout << "session download for dir" << i << "=" << info.stat.sd[i] << endl;
+ cout << "session download for dir " << i << "=" << info.stat.sd[i] << endl;
}
for (int i = 0; i < DIR_NUM; i++)
{
if (!data->request.monthUpload[i].res_empty())
- cout << "month upload for dir" << i << "=" << info.stat.mu[i] << endl;
+ cout << "month upload for dir " << i << " = " << info.stat.mu[i] << endl;
if (!data->request.monthDownload[i].res_empty())
- cout << "month download for dir" << i << "=" << info.stat.md[i] << endl;
+ cout << "month download for dir " << i << " = " << info.stat.md[i] << endl;
}
for (int i = 0; i < USERDATA_NUM; i++)
{
if (!data->request.userData[i].res_empty())
{
- string str;
+ std::string str;
ConvertFromKOI8(info.userData[i], &str);
- cout << "userdata" << i << "=" << str << endl;
+ cout << "user data " << i << " = " << str << endl;
}
}
{
string str;
ConvertFromKOI8(*strReqParams[i].value, &str);
- cout << strReqParams[i].name << "=" << str << endl;
+ cout << strReqParams[i].name << " = " << str << endl;
}
}
data->result = true;
}
//-----------------------------------------------------------------------------
-void RecvAuthByData(const PARSER_AUTH_BY::INFO & list, void *)
+bool ProcessSetUser(const std::string & server,
+ int port,
+ const std::string & login,
+ const std::string & password,
+ const std::string & str)
{
-for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
- cout << *it << "\n";
-cout << endl;
-}
-//-----------------------------------------------------------------------------
-int ProcessSetUser(const std::string &server,
- int port,
- const std::string &admLogin,
- const std::string &admPasswd,
- const std::string &str,
- void * data,
- bool isMessage)
-{
-SERVCONF sc;
-
-bool result = false;
+SERVCONF sc(server, port, login, password);
-sc.SetServer(server.c_str());
-sc.SetPort(port);
-sc.SetAdmLogin(admLogin.c_str());
-sc.SetAdmPassword(admPasswd.c_str());
+ResultData data;
+int res = sc.ChgUser(str.c_str(), ResultCallback, &data);
-REQUEST request;
-GetUserData cbdata(request, false);
-
-if (isMessage)
+if (res == st_ok && data.result)
{
- sc.SetSendMessageCb(RecvSetUserAnswer, &cbdata);
- sc.MsgUser(str.c_str());
+ printf("Ok\n");
+ return false;
}
+
+printf("Error\n");
+if (res != st_ok)
+ printf("%s\n", sc.GetStrError().c_str());
else
- {
- sc.SetChgUserCb(RecvSetUserAnswer, &cbdata);
- sc.ChgUser(str.c_str());
- }
+ printf("%s\n", data.reason.c_str());
+return true;
+}
+//-----------------------------------------------------------------------------
+bool ProcessSendMessage(const std::string & server, uint16_t port,
+ const std::string & login, const std::string & password,
+ const std::string & requestString)
+{
+SERVCONF sc(server, port, login, password);
-if (result)
+ResultData data;
+int res = sc.SendMessage(requestString.c_str(), ResultCallback, &data);
+
+if (res == st_ok && data.result)
{
printf("Ok\n");
- return 0;
- }
-else
- {
- printf("Error\n");
- return -1;
+ return true;
}
-return 0;
+printf("Error\n");
+if (res != st_ok)
+ printf("%s\n", sc.GetStrError().c_str());
+else
+ printf("%s\n", data.reason.c_str());
+return false;
}
//-----------------------------------------------------------------------------
-int ProcessGetUser(const std::string &server,
- int port,
- const std::string &admLogin,
- const std::string &admPasswd,
- const std::string &login,
- REQUEST & request)
+bool ProcessGetUser(const std::string &server,
+ int port,
+ const std::string &admLogin,
+ const std::string &admPasswd,
+ const std::string &login,
+ REQUEST & request)
{
-SERVCONF sc;
-
-sc.SetServer(server.c_str());
-sc.SetPort(port);
-sc.SetAdmLogin(admLogin.c_str());
-sc.SetAdmPassword(admPasswd.c_str());
+SERVCONF sc(server, port, admLogin, admPasswd);
-// TODO Good variable name :)
GetUserData data(request, false);
+bool res = (sc.GetUser(login.c_str(), GetUserCallback, &data) == st_ok);
-sc.SetGetUserCallback(GetUserCallback, &data);
-sc.GetUser(login.c_str());
-
-if (data.result)
+if (res && data.result)
{
printf("Ok\n");
- return 0;
- }
-else
- {
- printf("Error\n");
- return -1;
+ return true;
}
-return 0;
+printf("Error\n");
+if (!res)
+ printf("%s\n", sc.GetStrError().c_str());
+else
+ printf("%s\n", data.reason.c_str());
+return false;
}
//-----------------------------------------------------------------------------
-int ProcessAuthBy(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 port,
+ const std::string &admLogin,
+ const std::string &admPasswd,
+ const std::string &login)
{
-SERVCONF sc;
-
-sc.SetServer(server.c_str());
-sc.SetPort(port);
-sc.SetAdmLogin(admLogin.c_str());
-sc.SetAdmPassword(admPasswd.c_str());
+SERVCONF sc(server, port, admLogin, admPasswd);
-sc.SetAuthByCallback(RecvAuthByData, NULL);
-sc.AuthBy(login.c_str());
+ResultData data;
+bool res = (sc.AuthBy(login.c_str(), RecvAuthByData, &data) == st_ok);
-if (sc.GetError())
+if (res && data.result)
{
- printf("Error\n");
- return -1;
+ printf("Ok\n");
+ return true;
}
-printf("Ok\n");
-return 0;
+printf("Error\n");
+if (!res)
+ printf("%s\n", sc.GetStrError().c_str());
+else
+ printf("%s\n", data.reason.c_str());
+return false;
}
//-----------------------------------------------------------------------------
git.stg.codes / stg.git / blobdiff