sprintf(s, "<version value=\"%s\"/>", SERVER_VERSION);
answerList->push_back(s);
-sprintf(s, "<tariff_num value=\"%llu\"/>", (unsigned long long)tariffs->Count());
+sprintf(s, "<tariff_num value=\"%llu\"/>", static_cast<unsigned long long>(tariffs->Count()));
answerList->push_back(s);
sprintf(s, "<tariff value=\"%d\"/>", 2);
answerList->push_back(s);
-sprintf(s, "<users_num value=\"%llu\"/>", (unsigned long long)users->Count());
+sprintf(s, "<users_num value=\"%llu\"/>", static_cast<unsigned long long>(users->Count()));
answerList->push_back(s);
sprintf(s, "<uname value=\"%s\"/>", un);
for (int i = 0; i< DIR_NUM; i++)
{
- string dn2e;
+ std::string dn2e;
Encode12str(dn2e, settings->GetDirName(i));
sprintf(s, "<dir_name_%d value=\"%s\"/>", i, dn2e.c_str());
answerList->push_back(s);
//-----------------------------------------------------------------------------
void PARSER_GET_USER::CreateAnswer()
{
-string s;
-string enc;
+std::string s;
+std::string enc;
USER_PTR u;
if (users->FindByName(login, &u))
{
- s = "<user result=\"error\"/>";
- answerList->push_back(s);
+ answerList->push_back("<user result=\"error\" reason=\"User not found.\"/>");
return;
}
answerList->push_back(s);
-vector<USER_PROPERTY_LOGGED<string> *> userdata;
+std::vector<USER_PROPERTY_LOGGED<std::string> *> userdata;
userdata.push_back(u->GetProperty().userdata0.GetPointer());
userdata.push_back(u->GetProperty().userdata1.GetPointer());
userdata.push_back(u->GetProperty().userdata2.GetPointer());
userdata.push_back(u->GetProperty().userdata8.GetPointer());
userdata.push_back(u->GetProperty().userdata9.GetPointer());
-string tmpI;
+std::string tmpI;
for (unsigned i = 0; i < userdata.size(); i++)
{
Encode12str(enc, userdata[i]->Get());
strprintf(&s, "<PingTime value=\"%lu\" />", u->GetPingTime());
answerList->push_back(s);
-stringstream sstr;
+std::ostringstream sstr;
sstr << u->GetProperty().ips.Get();
strprintf(&s, "<ip value=\"%s\" />", sstr.str().c_str());
answerList->push_back(s);
for (int j = 0; j < DIR_NUM; j++)
{
- string s;
+ std::string s;
x2str(upload[j], s);
sprintf(st, " MU%d=\"%s\"", j, s.c_str());
strcat(ss, st);
strprintf(&s, "<CreditExpire value=\"%ld\" />", u->GetProperty().creditExpire.Get());
answerList->push_back(s);
+s = "<AuthorizedBy>";
+std::vector<std::string> list(u->GetAuthorizers());
+for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
+ s += "<Auth name=\"" + *it + "\"/>";
+s += "</AuthorizedBy>";
+answerList->push_back(s);
+
strprintf(&s, "</user>");
answerList->push_back(s);
}
{
answerList->erase(answerList->begin(), answerList->end());
-string s;
-string userStart;
-string traffStart;
-string traffMiddle;
-string traffFinish;
-string middle;
-string userFinish;
+std::string s;
+std::string userStart;
+std::string traffStart;
+std::string traffMiddle;
+std::string traffFinish;
+std::string middle;
+std::string userFinish;
-string enc;
+std::string enc;
USER_PTR u;
users->CloseSearch(h);
return;
}
-string updateTime;
+std::string updateTime;
x2str(time(NULL), updateTime);
if (lastUpdateFound)
middle += s;
}
- vector<USER_PROPERTY_LOGGED<string> *> userdata;
+ std::vector<USER_PROPERTY_LOGGED<std::string> *> userdata;
userdata.push_back(u->GetProperty().userdata0.GetPointer());
userdata.push_back(u->GetProperty().userdata1.GetPointer());
userdata.push_back(u->GetProperty().userdata2.GetPointer());
userdata.push_back(u->GetProperty().userdata8.GetPointer());
userdata.push_back(u->GetProperty().userdata9.GetPointer());
- string tmpI;
+ std::string tmpI;
for (unsigned i = 0; i < userdata.size(); i++)
{
if (userdata[i]->ModificationTime() > lastUserUpdateTime)
if (u->GetProperty().ips.ModificationTime() > lastUserUpdateTime)
{
- stringstream sstr;
+ std::ostringstream sstr;
sstr << u->GetProperty().ips.Get();
strprintf(&s, "<ip value=\"%s\" />", sstr.str().c_str());
middle += s;
{
for (int j = 0; j < DIR_NUM; j++)
{
- string s;
+ std::string s;
x2str(upload[j], s);
sprintf(st, " MU%d=\"%s\" ", j, s.c_str());
traffMiddle += st;
upr = new RESETABLE<uint64_t>[DIR_NUM];
downr = new RESETABLE<uint64_t>[DIR_NUM];
-};
+}
//-----------------------------------------------------------------------------
-string PARSER_CHG_USER::EncChar2String(const char * strEnc)
+std::string PARSER_CHG_USER::EncChar2String(const char * strEnc)
{
-string str;
+std::string str;
Decode21str(str, strEnc);
return str;
}
int dir;
DIR_TRAFF dtu;
DIR_TRAFF dtd;
- unsigned long long t = 0;
+ uint64_t t = 0;
while (attr[j])
{
dir = attr[j][2] - '0';
}
j+=2;
}
- usr->down = dtd;
- usr->up = dtu;
return 0;
}
bool check = false;
bool alwaysOnline = u->GetProperty().alwaysOnline;
-if (!ucr->alwaysOnline.res_empty())
+if (!ucr->alwaysOnline.empty())
{
check = true;
alwaysOnline = ucr->alwaysOnline.const_data();
}
bool onlyOneIP = u->GetProperty().ips.ConstData().OnlyOneIP();
-if (!ucr->ips.res_empty())
+if (!ucr->ips.empty())
{
check = true;
onlyOneIP = ucr->ips.const_data().OnlyOneIP();
{
printfd(__FILE__, "Requested change leads to a forbidden state: AlwaysOnline with multiple IP's\n");
GetStgLogger()("%s Requested change leads to a forbidden state: AlwaysOnline with multiple IP's", currAdmin->GetLogStr().c_str());
+ res = -1;
return -1;
}
-if (!ucr->ips.res_empty())
+for (size_t i = 0; i < ucr->ips.const_data().Count(); ++i)
+ {
+ CONST_USER_PTR user;
+ uint32_t ip = ucr->ips.const_data().operator[](i).ip;
+ if (users->IsIPInUse(ip, login, &user))
+ {
+ printfd(__FILE__, "Trying to assign an IP %s to '%s' that is already in use by '%s'\n", inet_ntostring(ip).c_str(), login.c_str(), user->GetLogin().c_str());
+ GetStgLogger()("%s trying to assign an IP %s to '%s' that is currently in use by '%s'", currAdmin->GetLogStr().c_str(), inet_ntostring(ip).c_str(), login.c_str(), user->GetLogin().c_str());
+ res = -1;
+ return -1;
+ }
+ }
+
+if (!ucr->ips.empty())
if (!u->GetProperty().ips.Set(ucr->ips.const_data(), currAdmin, login, store))
res = -1;
-if (!ucr->alwaysOnline.res_empty())
+if (!ucr->alwaysOnline.empty())
if (!u->GetProperty().alwaysOnline.Set(ucr->alwaysOnline.const_data(),
currAdmin, login, store))
res = -1;
-if (!ucr->address.res_empty())
+if (!ucr->address.empty())
if (!u->GetProperty().address.Set(ucr->address.const_data(), currAdmin, login, store))
res = -1;
-if (!ucr->creditExpire.res_empty())
+if (!ucr->creditExpire.empty())
if (!u->GetProperty().creditExpire.Set(ucr->creditExpire.const_data(),
currAdmin, login, store))
res = -1;
-if (!ucr->credit.res_empty())
+if (!ucr->credit.empty())
if (!u->GetProperty().credit.Set(ucr->credit.const_data(), currAdmin, login, store))
res = -1;
-if (!usr->freeMb.res_empty())
+if (!usr->freeMb.empty())
if (!u->GetProperty().freeMb.Set(usr->freeMb.const_data(), currAdmin, login, store))
res = -1;
-if (!ucr->disabled.res_empty())
+if (!ucr->disabled.empty())
if (!u->GetProperty().disabled.Set(ucr->disabled.const_data(), currAdmin, login, store))
res = -1;
-if (!ucr->disabledDetailStat.res_empty())
+if (!ucr->disabledDetailStat.empty())
if (!u->GetProperty().disabledDetailStat.Set(ucr->disabledDetailStat.const_data(), currAdmin, login, store))
res = -1;
-if (!ucr->email.res_empty())
+if (!ucr->email.empty())
if (!u->GetProperty().email.Set(ucr->email.const_data(), currAdmin, login, store))
res = -1;
-if (!ucr->group.res_empty())
+if (!ucr->group.empty())
if (!u->GetProperty().group.Set(ucr->group.const_data(), currAdmin, login, store))
res = -1;
-if (!ucr->note.res_empty())
+if (!ucr->note.empty())
if (!u->GetProperty().note.Set(ucr->note.const_data(), currAdmin, login, store))
res = -1;
-vector<USER_PROPERTY_LOGGED<string> *> userdata;
+std::vector<USER_PROPERTY_LOGGED<std::string> *> userdata;
userdata.push_back(u->GetProperty().userdata0.GetPointer());
userdata.push_back(u->GetProperty().userdata1.GetPointer());
userdata.push_back(u->GetProperty().userdata2.GetPointer());
for (int i = 0; i < (int)userdata.size(); i++)
{
- if (!ucr->userdata[i].res_empty())
+ if (!ucr->userdata[i].empty())
{
if(!userdata[i]->Set(ucr->userdata[i].const_data(), currAdmin, login, store))
res = -1;
}
}
-if (!ucr->passive.res_empty())
+if (!ucr->passive.empty())
if (!u->GetProperty().passive.Set(ucr->passive.const_data(), currAdmin, login, store))
res = -1;
-if (!ucr->password.res_empty())
+if (!ucr->password.empty())
if (!u->GetProperty().password.Set(ucr->password.const_data(), currAdmin, login, store))
res = -1;
-if (!ucr->phone.res_empty())
+if (!ucr->phone.empty())
if (!u->GetProperty().phone.Set(ucr->phone.const_data(), currAdmin, login, store))
res = -1;
-if (!ucr->realName.res_empty())
+if (!ucr->realName.empty())
if (!u->GetProperty().realName.Set(ucr->realName.const_data(), currAdmin, login, store))
res = -1;
-if (!usr->cash.res_empty())
+if (!usr->cash.empty())
{
//if (*currAdmin->GetPriv()->userCash)
{
}
-if (!ucr->tariffName.res_empty())
+if (!ucr->tariffName.empty())
{
if (tariffs->FindByName(ucr->tariffName.const_data()))
{
}
}
-if (!ucr->nextTariff.res_empty())
+if (!ucr->nextTariff.empty())
{
if (tariffs->FindByName(ucr->nextTariff.const_data()))
{
int downCount = 0;
for (int i = 0; i < DIR_NUM; i++)
{
- if (!upr[i].res_empty())
+ if (!upr[i].empty())
{
- up[i] = upr[i];
+ up[i] = upr[i].data();
upCount++;
}
- if (!downr[i].res_empty())
+ if (!downr[i].empty())
{
- down[i] = downr[i];
+ down[i] = downr[i].data();
downCount++;
}
}
if (!u->GetProperty().down.Set(down, currAdmin, login, store))
res = -1;
-/*if (!usr->down.res_empty())
- {
- u->GetProperty().down.Set(usr->down.const_data(), currAdmin, login, store);
- }
-if (!usr->up.res_empty())
- {
- u->GetProperty().up.Set(usr->up.const_data(), currAdmin, login, store);
- }*/
-
u->WriteConf();
u->WriteStat();
printfd(__FILE__, "User not found. %s\n", logins[i].c_str());
continue;
}
- msg.header.creationTime = stgTime;
+ msg.header.creationTime = static_cast<unsigned int>(stgTime);
u->AddMessage(&msg);
result = res_ok;
}
break;
case res_params_error:
printfd(__FILE__, "res_params_error\n");
- answerList->push_back("<SendMessageResult value=\"Parameters error\"/>");
+ answerList->push_back("<SendMessageResult value=\"Parameters error.\"/>");
break;
case res_unknown:
printfd(__FILE__, "res_unknown\n");
- answerList->push_back("<SendMessageResult value=\"Unknown user\"/>");
+ answerList->push_back("<SendMessageResult value=\"Unknown user.\"/>");
break;
default:
printfd(__FILE__, "res_default\n");
answerList->push_back("<DelUser value=\"ok\"/>");
}
//-----------------------------------------------------------------------------
-/*void PARSERDELUSER::CreateAnswer(char * mes)
-{
-//answerList->clear();
-answerList->erase(answerList->begin(), answerList->end());
-
-char str[255];
-sprintf(str, "<DelUser value=\"%s\"/>", mes);
-answerList->push_back(str);
-}*/
-//-----------------------------------------------------------------------------
// CHECK USER
// <checkuser login="vasya" password=\"123456\"/>
//-----------------------------------------------------------------------------
int PARSER_CHECK_USER::ParseStart(void *, const char *el, const char **attr)
{
-result = false;
-
if (strcasecmp(el, "CheckUser") == 0)
{
if (attr[0] == NULL || attr[1] == NULL
|| attr[2] == NULL || attr[3] == NULL)
{
- result = false;
- CreateAnswer();
+ CreateAnswer("Invalid parameters.");
printfd(__FILE__, "PARSER_CHECK_USER - attr err\n");
return 0;
}
USER_PTR user;
if (users->FindByName(attr[1], &user))
{
- result = false;
- CreateAnswer();
+ CreateAnswer("User not found.");
printfd(__FILE__, "PARSER_CHECK_USER - login err\n");
return 0;
}
if (strcmp(user->GetProperty().password.Get().c_str(), attr[3]))
{
- result = false;
- CreateAnswer();
+ CreateAnswer("Wrong password.");
printfd(__FILE__, "PARSER_CHECK_USER - passwd err\n");
return 0;
}
- result = true;
- CreateAnswer();
+ CreateAnswer(NULL);
return 0;
}
return -1;
return -1;
}
//-----------------------------------------------------------------------------
-void PARSER_CHECK_USER::CreateAnswer()
+void PARSER_CHECK_USER::CreateAnswer(const char * error)
{
-if (result)
- answerList->push_back("<CheckUser value=\"Ok\"/>");
+if (error)
+ answerList->push_back(std::string("<CheckUser value=\"Err\" reason=\"") + error + "\"/>");
else
- answerList->push_back("<CheckUser value=\"Err\"/>");
+ answerList->push_back("<CheckUser value=\"Ok\"/>");
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
git.stg.codes / stg.git / blobdiff