*/
-#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;
//-----------------------------------------------------------------------------
struct GetUserData
{
+ GetUserData(REQUEST & req, bool res) : request(req), result(res) {}
REQUEST & request;
bool result;
};
//---------------------------------------------------------------------------
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)
-{
-ConvertKOI8(src, dst, TO_KOI8);
-}
-//-----------------------------------------------------------------------------
int RecvSetUserAnswer(const char * ans, void * d)
{
-GetUserCbData * gucbd;
-gucbd = (GetUserCbData *)d;
-
-bool * result = gucbd->result;
+GetUserData * data = static_cast<GetUserData *>(d);
-//REQUEST * req = (REQUEST *)gucbd->data;
+std::cout << ans << std::endl;
-//printf("ans=%s\n", ans);
-if (strcasecmp("Ok", ans) == 0)
- *result = true;
-else
- *result = false;
+data->result = (strcasecmp("Ok", ans) == 0);
return 0;
}
//-----------------------------------------------------------------------------
struct StringReqParams
{
- string name;
- RESETABLE<string> reqParam;
- string * value;
+ std::string name;
+ RESETABLE<std::string> reqParam;
+ const std::string * value;
};
//-----------------------------------------------------------------------------
void GetUserCallback(const PARSER_GET_USER::INFO & info, void * d)
{
GetUserData * data = static_cast<GetUserData *>(d);
-REQUEST * req = (REQUEST *)gucbd->data;
-
if (info.login == "")
{
data->result = false;
}
if (!data->request.cash.res_empty())
- cout << "cash=" << info.cash << endl;
+ cout << "cash = " << info.cash << endl;
-if (!data->requst.credit.res_empty())
- cout << "credit=" << info.credit << endl;
+if (!data->request.credit.res_empty())
+ cout << "credit = " << info.credit << endl;
-if (!data->requst.creditExpire.res_empty())
+if (!data->request.creditExpire.res_empty())
{
char buf[32];
struct tm brokenTime;
strftime(buf, 32, "%Y-%m-%d", &brokenTime);
- cout << "creditExpire=" << buf << endl;
+ cout << "creditExpire = " << buf << endl;
}
-if (!data->requst.down.res_empty())
- cout << "down=" << info.down << endl;
+if (!data->request.down.res_empty())
+ cout << "down = " << info.down << endl;
-if (!data->requst.passive.res_empty())
- cout << "passive=" << info.passive << endl;
+if (!data->request.passive.res_empty())
+ cout << "passive = " << info.passive << endl;
-if (!data->requst.disableDetailStat.res_empty())
- cout << "disableDetailStat=" << info.disableDetailStat << endl;
+if (!data->request.disableDetailStat.res_empty())
+ cout << "disableDetailStat = " << info.disableDetailStat << endl;
-if (!data->requst.alwaysOnline.res_empty())
- cout << "alwaysOnline=" << info.alwaysOnline << endl;
+if (!data->request.alwaysOnline.res_empty())
+ cout << "alwaysOnline = " << info.alwaysOnline << endl;
-if (!data->requst.prepaidTraff.res_empty())
- cout << "prepaidTraff=" << info.prepaidTraff << endl;
+if (!data->request.prepaidTraff.res_empty())
+ cout << "prepaidTraff = " << info.prepaidTraff << endl;
for (int i = 0; i < DIR_NUM; i++)
{
- if (!data->requst.sessionUpload[i].res_empty())
- cout << "session upload for dir" << i << "=" << info.stat.su[i] << endl;
- if (!data->requst.sessionDownload[i].res_empty())
- cout << "session download for dir" << i << "=" << info.stat.sd[i] << endl;
+ if (!data->request.sessionUpload[i].res_empty())
+ 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;
}
for (int i = 0; i < DIR_NUM; i++)
{
- if (!data->requst.monthUpload[i].res_empty())
- cout << "month upload for dir" << i << "=" << info.stat.mu[i] << endl;
- if (!data->requst.monthDownload[i].res_empty())
- cout << "month download for dir" << i << "=" << info.stat.md[i] << endl;
+ if (!data->request.monthUpload[i].res_empty())
+ 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;
}
for (int i = 0; i < USERDATA_NUM; i++)
{
- if (!data->requst.ud[i].res_empty())
+ 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;
}
}
StringReqParams strReqParams[] =
{
- {"note", data->requst.note, &info.note},
- {"name", data->requst.name, &info.name},
- {"address", data->requst.address, &info.address},
- {"email", data->requst.email, &info.email},
- {"phone", data->requst.phone, &info.phone},
- {"group", data->requst.group, &info.group},
- {"tariff", data->requst.tariff, &info.tariff},
- {"password", data->requst.usrPasswd, &info.password},
- {"ip", data->requst.ips, &info.ips} // IP-address of user
+ {"note", data->request.note, &info.note},
+ {"name", data->request.name, &info.name},
+ {"address", data->request.address, &info.address},
+ {"email", data->request.email, &info.email},
+ {"phone", data->request.phone, &info.phone},
+ {"group", data->request.group, &info.group},
+ {"tariff", data->request.tariff, &info.tariff},
+ {"password", data->request.usrPasswd, &info.password},
+ {"ip", data->request.ips, &info.ips} // IP-address of user
};
for (unsigned i = 0; i < sizeof(strReqParams) / sizeof(StringReqParams); i++)
{
{
string str;
ConvertFromKOI8(*strReqParams[i].value, &str);
- cout << strReqParams[i].name << "=" << str << endl;
+ cout << strReqParams[i].name << " = " << str << endl;
}
}
data->result = true;
const std::string &admLogin,
const std::string &admPasswd,
const std::string &str,
- void * data,
bool isMessage)
{
SERVCONF sc;
-bool result = false;
-
-
sc.SetServer(server.c_str());
sc.SetPort(port);
sc.SetAdmLogin(admLogin.c_str());
sc.SetAdmPassword(admPasswd.c_str());
-// TODO Good variable name :)
-GetUserCbData gucbd;
-
-gucbd.data = data;
-gucbd.result = &result;
+REQUEST request;
+GetUserData cbdata(request, false);
+int res = 0;
if (isMessage)
{
- sc.SetSendMessageCb(RecvSetUserAnswer, &gucbd);
- sc.MsgUser(str.c_str());
+ sc.SetSendMessageCallback(RecvSetUserAnswer, &cbdata);
+ res = sc.SendMessage(str.c_str());
}
else
{
- sc.SetChgUserCb(RecvSetUserAnswer, &gucbd);
- sc.ChgUser(str.c_str());
+ sc.SetChgUserCallback(RecvSetUserAnswer, &cbdata);
+ res = sc.ChgUser(str.c_str());
}
-if (result)
+if (res == st_ok && cbdata.result)
{
printf("Ok\n");
return 0;
else
{
printf("Error\n");
+ if (res != st_ok)
+ printf("%s\n", sc.GetStrError().c_str());
return -1;
}
{
SERVCONF sc;
-bool result = false;
-
sc.SetServer(server.c_str());
sc.SetPort(port);
sc.SetAdmLogin(admLogin.c_str());
sc.SetAdmPassword(admPasswd.c_str());
-// TODO Good variable name :)
-GetUserCbData gucbd;
-
-gucbd.data = &request;
-gucbd.result = &result;
+GetUserData data(request, false);
-sc.SetGetUserCallback(GetUserCallback, &gucbd);
-sc.GetUser(login.c_str());
+sc.SetGetUserCallback(GetUserCallback, &data);
+bool res = (sc.GetUser(login.c_str()) == st_ok);
-if (result)
+if (res && data.result)
{
printf("Ok\n");
return 0;
int port,
const std::string &admLogin,
const std::string &admPasswd,
- const std::string &login,
- REQUEST & request)
+ const std::string &login)
{
SERVCONF sc;
sc.SetAdmPassword(admPasswd.c_str());
sc.SetAuthByCallback(RecvAuthByData, NULL);
-sc.AuthBy(login.c_str());
+bool res = (sc.AuthBy(login.c_str()) == st_ok);
-if (sc.GetError())
+if (!res)
{
printf("Error\n");
return -1;
git.stg.codes / stg.git / blobdiff