const int TO_KOI8 = 0;
const int FROM_KOI8 = 1;
//-----------------------------------------------------------------------------
-struct GetUserCbData
+struct GetUserData
{
- void * data;
- bool * result;
+ GetUserData(REQUEST & req, bool res) : request(req), result(res) {}
+ REQUEST & request;
+ bool result;
};
//---------------------------------------------------------------------------
struct HelpParams
{"set credit expire", "get credit expire", "-E", "<credit_expire_date>"},
{"set password", "get password", "-o", "<new_password>"},
{"set prepaid traffic", "get prepaid traffic", "-e", "<prepaid>"},
- {"set IP-addresses", "get IP-addresses", "-I", "<*|ip_addr[,ip_addr...]>"},
+ {"set IP-addresses", "get IP-addresses", "-I", "<*|ip_addr[,ip_addr...]>"},
{"set name", "get name", "-A", "<name>"},
{"set note", "get note", "-N", "<note>"},
{"set street address", "get street address", "-D", "<address>"},
//-----------------------------------------------------------------------------
int RecvSetUserAnswer(const char * ans, void * d)
{
-GetUserCbData * gucbd;
-gucbd = (GetUserCbData *)d;
+GetUserData * data = static_cast<GetUserData *>(d);
-bool * result = gucbd->result;
-
-//REQUEST * req = (REQUEST *)gucbd->data;
-
-//printf("ans=%s\n", ans);
-if (strcasecmp("Ok", ans) == 0)
- *result = true;
-else
- *result = false;
+data->result = (strcasecmp("Ok", ans) == 0);
return 0;
}
{
string name;
RESETABLE<string> reqParam;
- string * value;
+ const string * value;
};
//-----------------------------------------------------------------------------
-void RecvUserData(USERDATA * ud, void * d)
+void GetUserCallback(const PARSER_GET_USER::INFO & info, void * d)
{
-GetUserCbData * gucbd;
-gucbd = (GetUserCbData *)d;
+GetUserData * data = static_cast<GetUserData *>(d);
-bool * result = gucbd->result;
-
-REQUEST * req = (REQUEST *)gucbd->data;
-
-if (ud->login == "")
+if (info.login == "")
{
- *result = false;
+ data->result = false;
return;
}
-if (!req->cash.res_empty())
- cout << "cash=" << ud->cash << endl;
+if (!data->request.cash.res_empty())
+ cout << "cash = " << info.cash << endl;
-if (!req->credit.res_empty())
- cout << "credit=" << ud->credit << endl;
+if (!data->request.credit.res_empty())
+ cout << "credit = " << info.credit << endl;
-if (!req->creditExpire.res_empty())
+if (!data->request.creditExpire.res_empty())
{
char buf[32];
struct tm brokenTime;
- time_t tt = ud->creditExpire;
+ time_t tt = info.creditExpire;
brokenTime.tm_wday = 0;
brokenTime.tm_yday = 0;
strftime(buf, 32, "%Y-%m-%d", &brokenTime);
- cout << "creditExpire=" << buf << endl;
+ cout << "creditExpire = " << buf << endl;
}
-if (!req->down.res_empty())
- cout << "down=" << ud->down << endl;
+if (!data->request.down.res_empty())
+ cout << "down = " << info.down << endl;
-if (!req->passive.res_empty())
- cout << "passive=" << ud->passive << endl;
+if (!data->request.passive.res_empty())
+ cout << "passive = " << info.passive << endl;
-if (!req->disableDetailStat.res_empty())
- cout << "disableDetailStat=" << ud->disableDetailStat << endl;
+if (!data->request.disableDetailStat.res_empty())
+ cout << "disableDetailStat = " << info.disableDetailStat << endl;
-if (!req->alwaysOnline.res_empty())
- cout << "alwaysOnline=" << ud->alwaysOnline << endl;
+if (!data->request.alwaysOnline.res_empty())
+ cout << "alwaysOnline = " << info.alwaysOnline << endl;
-if (!req->prepaidTraff.res_empty())
- cout << "prepaidTraff=" << ud->prepaidTraff << endl;
+if (!data->request.prepaidTraff.res_empty())
+ cout << "prepaidTraff = " << info.prepaidTraff << endl;
for (int i = 0; i < DIR_NUM; i++)
{
- if (!req->u[i].res_empty())
- cout << "u" << i << "=" << ud->stat.mu[i] << endl;
- if (!req->d[i].res_empty())
- cout << "d" << i << "=" << ud->stat.md[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->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 (!req->ud[i].res_empty())
+ if (!data->request.userData[i].res_empty())
{
string str;
- ConvertFromKOI8(ud->userData[i], &str);
- cout << "userdata" << i << "=" << str << endl;
+ ConvertFromKOI8(info.userData[i], &str);
+ cout << "user data " << i << " = " << str << endl;
}
}
StringReqParams strReqParams[] =
{
- {"note", req->note, &ud->note},
- {"name", req->name, &ud->name},
- {"address", req->address, &ud->address},
- {"email", req->email, &ud->email},
- {"phone", req->phone, &ud->phone},
- {"group", req->group, &ud->group},
- {"tariff", req->tariff, &ud->tariff},
- {"password", req->usrPasswd, &ud->password},
- {"ip", req->ips, &ud->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;
}
}
-*result = true;
+data->result = true;
}
//-----------------------------------------------------------------------------
void RecvAuthByData(const PARSER_AUTH_BY::INFO & list, void *)
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.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.SetSendMessageCb(RecvSetUserAnswer, &cbdata);
+ res = sc.MsgUser(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 && cbdata.result)
{
printf("Ok\n");
return 0;
const std::string &admLogin,
const std::string &admPasswd,
const std::string &login,
- void * data)
+ REQUEST & request)
{
SERVCONF sc;
-bool result = false;
-
-sc.SetServer(server.c_str()); // õÓÔÁÎÁ×ÌÉ×ÁÅÍ ÉÍÑ ÓÅÒ×ÅÒÁ Ó ËÏÔÏÒÇÏ ÚÁÂÉÒÁÔØ ÉÎÆÕ
-sc.SetPort(port); // ÁÄÍÉÎÓËÉÊ ÐÏÒÔ ÓÅÒ×ÅÒÁÐÏÒÔ
-sc.SetAdmLogin(admLogin.c_str()); // ÷ÙÓÔÁ×ÌÑÅÍ ÌÏÇÉÎ É ÐÁÒÏÌØ ÁÄÍÉÎÁ
+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;
+GetUserData data(request, false);
-sc.SetGetUserDataRecvCb(RecvUserData, &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,
- void * data)
+ 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