{"passive", 0, 0, 'i'}, //passive
{"disable-stat",0, 0, 'S'}, //disable detail stat
{"always-online",0, 0, 'O'}, //always online
-{"session-upload", 1, 0, 500}, //SU0
-{"session-download", 1, 0, 501}, //SD0
-{"month-upload", 1, 0, 502}, //MU0
-{"month-download", 1, 0, 503}, //MD0
-
-{"user-data", 1, 0, 700}, //UserData0
+{"u0", 0, 0, 500}, //U0
+{"u1", 0, 0, 501}, //U1
+{"u2", 0, 0, 502}, //U2
+{"u3", 0, 0, 503}, //U3
+{"u4", 0, 0, 504}, //U4
+{"u5", 0, 0, 505}, //U5
+{"u6", 0, 0, 506}, //U6
+{"u7", 0, 0, 507}, //U7
+{"u8", 0, 0, 508}, //U8
+{"u9", 0, 0, 509}, //U9
+{"d0", 0, 0, 600}, //D0
+{"d1", 0, 0, 601}, //D1
+{"d2", 0, 0, 602}, //D2
+{"d3", 0, 0, 603}, //D3
+{"d4", 0, 0, 604}, //D4
+{"d5", 0, 0, 605}, //D5
+{"d6", 0, 0, 606}, //D6
+{"d7", 0, 0, 607}, //D7
+{"d8", 0, 0, 608}, //D8
+{"d9", 0, 0, 609}, //D9
+
+{"ud0", 0, 0, 700}, //UserData0
+{"ud1", 0, 0, 701}, //UserData1
+{"ud2", 0, 0, 702}, //UserData2
+{"ud3", 0, 0, 703}, //UserData3
+{"ud4", 0, 0, 704}, //UserData4
+{"ud5", 0, 0, 705}, //UserData5
+{"ud6", 0, 0, 706}, //UserData6
+{"ud7", 0, 0, 707}, //UserData7
+{"ud8", 0, 0, 708}, //UserData8
+{"ud9", 0, 0, 709}, //UserData9
{"prepaid", 0, 0, 'e'}, //prepaid traff
{"create", 0, 0, 'n'}, //create
{"passive", 1, 0, 'i'}, //passive
{"disable-stat",1, 0, 'S'}, //disable detail stat
{"always-online",1, 0, 'O'}, //always online
-{"session-upload", 1, 0, 500}, //U0
-{"session-download", 1, 0, 501}, //U1
-{"month-upload", 1, 0, 502}, //U2
-{"month-download", 1, 0, 503}, //U3
-
-{"user-data", 1, 0, 700}, //UserData
+{"u0", 1, 0, 500}, //U0
+{"u1", 1, 0, 501}, //U1
+{"u2", 1, 0, 502}, //U2
+{"u3", 1, 0, 503}, //U3
+{"u4", 1, 0, 504}, //U4
+{"u5", 1, 0, 505}, //U5
+{"u6", 1, 0, 506}, //U6
+{"u7", 1, 0, 507}, //U7
+{"u8", 1, 0, 508}, //U8
+{"u9", 1, 0, 509}, //U9
+{"d0", 1, 0, 600}, //D0
+{"d1", 1, 0, 601}, //D1
+{"d2", 1, 0, 602}, //D2
+{"d3", 1, 0, 603}, //D3
+{"d4", 1, 0, 604}, //D4
+{"d5", 1, 0, 605}, //D5
+{"d6", 1, 0, 606}, //D6
+{"d7", 1, 0, 607}, //D7
+{"d8", 1, 0, 608}, //D8
+{"d9", 1, 0, 609}, //D9
+
+{"ud0", 1, 0, 700}, //UserData
+{"ud1", 1, 0, 701}, //UserData1
+{"ud2", 1, 0, 702}, //UserData2
+{"ud3", 1, 0, 703}, //UserData3
+{"ud4", 1, 0, 704}, //UserData4
+{"ud5", 1, 0, 705}, //UserData5
+{"ud6", 1, 0, 706}, //UserData6
+{"ud7", 1, 0, 707}, //UserData7
+{"ud8", 1, 0, 708}, //UserData8
+{"ud9", 1, 0, 709}, //UserData9
{"prepaid", 1, 0, 'e'}, //prepaid traff
{"create", 1, 0, 'n'}, //create
exit(ICONV_ERR_CODE);
}
-#if defined(FREE_BSD) || defined(FREE_BSD5)
+#if defined(CONST_ICONV)
nconv = iconv (cd, (const char**)&inbuf, &insize, &outbuf, &outsize);
#else
nconv = iconv (cd, &inbuf, &insize, &outbuf, &outsize);
r[0] = 0;
-if (!req->usrMsg.res_empty())
+if (!req->usrMsg.empty())
{
string msg;
- Encode12str(msg, req->usrMsg);
+ Encode12str(msg, req->usrMsg.const_data());
sprintf(str, "<Message login=\"%s\" msgver=\"1\" msgtype=\"1\" repeat=\"0\" repeatperiod=\"0\" showtime=\"0\" text=\"%s\"/>", req->login.const_data().c_str(), msg.c_str());
//sprintf(str, "<message login=\"%s\" priority=\"0\" text=\"%s\"/>\n", req->login, msg);
strcat(r, str);
strcat(r, "<SetUser>\n");
sprintf(str, "<login value=\"%s\"/>\n", req->login.const_data().c_str());
strcat(r, str);
-if (!req->credit.res_empty())
+if (!req->credit.empty())
{
sprintf(str, "<credit value=\"%f\"/>\n", req->credit.const_data());
strcat(r, str);
}
-if (!req->creditExpire.res_empty())
+if (!req->creditExpire.empty())
{
sprintf(str, "<creditExpire value=\"%ld\"/>\n", req->creditExpire.const_data());
strcat(r, str);
}
-if (!req->prepaidTraff.res_empty())
+if (!req->prepaidTraff.empty())
{
sprintf(str, "<FreeMb value=\"%f\"/>\n", req->prepaidTraff.const_data());
strcat(r, str);
}
-if (!req->cash.res_empty())
+if (!req->cash.empty())
{
string msg;
- Encode12str(msg, req->message);
+ Encode12str(msg, req->message.c_str());
sprintf(str, "<cash add=\"%f\" msg=\"%s\"/>\n", req->cash.const_data(), msg.c_str());
strcat(r, str);
}
-if (!req->setCash.res_empty())
+if (!req->setCash.empty())
{
string msg;
- Encode12str(msg, req->message);
+ Encode12str(msg, req->message.c_str());
sprintf(str, "<cash set=\"%f\" msg=\"%s\"/>\n", req->setCash.const_data(), msg.c_str());
strcat(r, str);
}
-if (!req->usrPasswd.res_empty())
+if (!req->usrPasswd.empty())
{
sprintf(str, "<password value=\"%s\" />\n", req->usrPasswd.const_data().c_str());
strcat(r, str);
}
-if (!req->down.res_empty())
+if (!req->down.empty())
{
sprintf(str, "<down value=\"%d\" />\n", req->down.const_data());
strcat(r, str);
}
-if (!req->passive.res_empty())
+if (!req->passive.empty())
{
sprintf(str, "<passive value=\"%d\" />\n", req->passive.const_data());
strcat(r, str);
}
-if (!req->disableDetailStat.res_empty())
+if (!req->disableDetailStat.empty())
{
sprintf(str, "<disableDetailStat value=\"%d\" />\n", req->disableDetailStat.const_data());
strcat(r, str);
}
-if (!req->alwaysOnline.res_empty())
+if (!req->alwaysOnline.empty())
{
sprintf(str, "<aonline value=\"%d\" />\n", req->alwaysOnline.const_data());
strcat(r, str);
}
// IP-address of user
-if (!req->ips.res_empty())
+if (!req->ips.empty())
{
sprintf(str, "<ip value=\"%s\" />\n", req->ips.const_data().c_str());
strcat(r, str);
int dPresent = false;
for (int i = 0; i < DIR_NUM; i++)
{
- if (!req->u[i].res_empty())
+ if (!req->u[i].empty())
{
if (!uPresent && !dPresent)
{
sprintf(str, "MU%d=\"%s\" ", i, ss.str().c_str());
strcat(r, str);
}
- if (!req->d[i].res_empty())
+ if (!req->d[i].empty())
{
if (!uPresent && !dPresent)
{
//printf("%s\n", r);
-if (!req->tariff.res_empty())
+if (!req->tariff.empty())
{
switch (req->chgTariff)
{
}
-if (!req->note.res_empty())
+if (!req->note.empty())
{
string note;
- Encode12str(note, req->note);
+ Encode12str(note, req->note.const_data());
sprintf(str, "<note value=\"%s\"/>", note.c_str());
strcat(r, str);
}
-if (!req->name.res_empty())
+if (!req->name.empty())
{
string name;
- Encode12str(name, req->name);
+ Encode12str(name, req->name.const_data());
sprintf(str, "<name value=\"%s\"/>", name.c_str());
strcat(r, str);
}
-if (!req->address.res_empty())
+if (!req->address.empty())
{
string address;
- Encode12str(address, req->address);
+ Encode12str(address, req->address.const_data());
sprintf(str, "<address value=\"%s\"/>", address.c_str());
strcat(r, str);
}
-if (!req->email.res_empty())
+if (!req->email.empty())
{
string email;
- Encode12str(email, req->email);
+ Encode12str(email, req->email.const_data());
sprintf(str, "<email value=\"%s\"/>", email.c_str());
strcat(r, str);
}
-if (!req->phone.res_empty())
+if (!req->phone.empty())
{
string phone;
- Encode12str(phone, req->phone);
+ Encode12str(phone, req->phone.const_data());
sprintf(str, "<phone value=\"%s\"/>", phone.c_str());
strcat(r, str);
}
-if (!req->group.res_empty())
+if (!req->group.empty())
{
string group;
- Encode12str(group, req->group);
+ Encode12str(group, req->group.const_data());
sprintf(str, "<group value=\"%s\"/>", group.c_str());
strcat(r, str);
}
for (int i = 0; i < USERDATA_NUM; i++)
{
- if (!req->ud[i].res_empty())
+ if (!req->ud[i].empty())
{
string ud;
- Encode12str(ud, req->ud[i]);
+ Encode12str(ud, req->ud[i].const_data());
sprintf(str, "<userdata%d value=\"%s\"/>", i, ud.c_str());
strcat(r, str);
}
int u = false;
int d = false;
int ud = false;
-int a = !req->admLogin.res_empty()
- && !req->admPasswd.res_empty()
- && !req->server.res_empty()
- && !req->port.res_empty()
- && !req->login.res_empty();
-
-int b = !req->cash.res_empty()
- || !req->setCash.res_empty()
- || !req->credit.res_empty()
- || !req->prepaidTraff.res_empty()
- || !req->tariff.res_empty()
- || !req->usrMsg.res_empty()
- || !req->usrPasswd.res_empty()
-
- || !req->note.res_empty()
- || !req->name.res_empty()
- || !req->address.res_empty()
- || !req->email.res_empty()
- || !req->phone.res_empty()
- || !req->group.res_empty()
- || !req->ips.res_empty() // IP-address of user
+int a = !req->admLogin.empty()
+ && !req->admPasswd.empty()
+ && !req->server.empty()
+ && !req->port.empty()
+ && !req->login.empty();
+
+int b = !req->cash.empty()
+ || !req->setCash.empty()
+ || !req->credit.empty()
+ || !req->prepaidTraff.empty()
+ || !req->tariff.empty()
+ || !req->usrMsg.empty()
+ || !req->usrPasswd.empty()
+
+ || !req->note.empty()
+ || !req->name.empty()
+ || !req->address.empty()
+ || !req->email.empty()
+ || !req->phone.empty()
+ || !req->group.empty()
+ || !req->ips.empty() // IP-address of user
|| !req->createUser
|| !req->deleteUser;
for (int i = 0; i < DIR_NUM; i++)
{
- if (req->u[i].res_empty())
+ if (req->u[i].empty())
{
u = true;
break;
for (int i = 0; i < DIR_NUM; i++)
{
- if (req->d[i].res_empty())
+ if (req->d[i].empty())
{
d = true;
break;
for (int i = 0; i < DIR_NUM; i++)
{
- if (req->ud[i].res_empty())
+ if (req->ud[i].empty())
{
ud = true;
break;
case 'G': //Group
req.group = " ";
break;
-
+
case 'I': //IP-address of user
req.ips = " ";
break;
break;
case 500: //U
- //printf("U%d\n", c - 500);
- req.sessionUpload[optarg] = 1;
- break;
case 501:
- //printf("U%d\n", c - 500);
- req.sessionDownload[optarg] = 1;
- break;
case 502:
- //printf("U%d\n", c - 500);
- req.monthUpload[optarg] = 1;
- break;
case 503:
+ case 504:
+ case 505:
+ case 506:
+ case 507:
+ case 508:
+ case 509:
//printf("U%d\n", c - 500);
- req.monthDownload[optarg] = 1;
+ req.u[c - 500] = 1;
+ break;
+
+ case 600: //D
+ case 601:
+ case 602:
+ case 603:
+ case 604:
+ case 605:
+ case 606:
+ case 607:
+ case 608:
+ case 609:
+ //printf("D%d\n", c - 600);
+ req.d[c - 600] = 1;
break;
case 700: //UserData
+ case 701:
+ case 702:
+ case 703:
+ case 704:
+ case 705:
+ case 706:
+ case 707:
+ case 708:
+ case 709:
//printf("UD%d\n", c - 700);
- req.ud[optarg] = " ";
+ req.ud[c - 700] = " ";
break;
case 800:
}
if (req.authBy)
- return ProcessAuthBy(req.server, req.port, req.admLogin, req.admPasswd, req.login, req);
+ return ProcessAuthBy(req.server.const_data(), req.port.const_data(), req.admLogin.const_data(), req.admPasswd.const_data(), req.login.const_data(), &req);
else
- return ProcessGetUser(req.server, req.port, req.admLogin, req.admPasswd, req.login, req);
+ return ProcessGetUser(req.server.const_data(), req.port.const_data(), req.admLogin.const_data(), req.admPasswd.const_data(), req.login.const_data(), &req);
}
//-----------------------------------------------------------------------------
int mainSet(int argc, char **argv)
break;
case 'P': //phone
- ParseAnyString(optarg, &str);
+ ParseAnyString(optarg, &str, "koi8-ru");
req.phone = str;
break;
break;
case 500: //U
- //printf("U%d\n", c - 500);
- req.sesionUpload[optarg] = ParseTraff(argv[optind++]);
- break;
case 501:
- //printf("U%d\n", c - 500);
- req.sessionDownload[optarg] = ParseTraff(argv[optind++]);
- break;
case 502:
- //printf("U%d\n", c - 500);
- req.monthUpload[optarg] = ParseTraff(argv[optind++]);
- break;
case 503:
+ case 504:
+ case 505:
+ case 506:
+ case 507:
+ case 508:
+ case 509:
//printf("U%d\n", c - 500);
- req.monthDownload[optarg] = ParseTraff(argv[optind++]);
+ req.u[c - 500] = ParseTraff(optarg);
+ break;
+
+ case 600: //D
+ case 601:
+ case 602:
+ case 603:
+ case 604:
+ case 605:
+ case 606:
+ case 607:
+ case 608:
+ case 609:
+ //printf("D%d\n", c - 600);
+ req.d[c - 600] = ParseTraff(optarg);
break;
case 700: //UserData
- ParseAnyString(argv[optind++], &str);
+ case 701:
+ case 702:
+ case 703:
+ case 704:
+ case 705:
+ case 706:
+ case 707:
+ case 708:
+ case 709:
+ ParseAnyString(optarg, &str, "koi8-ru");
//printf("UD%d\n", c - 700);
- req.userData[optarg] = str;
+ req.ud[c - 700] = str;
break;
case '?':
memset(rstr, 0, rLen);
CreateRequestSet(&req, rstr);
-return ProcessSetUser(req.server, req.port, req.admLogin, req.admPasswd, rstr, NULL, isMessage);
+return ProcessSetUser(req.server.const_data(), req.port.const_data(), req.admLogin.const_data(), req.admPasswd.const_data(), rstr, NULL, isMessage);
}
//-----------------------------------------------------------------------------
int main(int argc, char **argv)
git.stg.codes / stg.git / blobdiff