$Date: 2010/03/25 14:37:43 $
*/
-#include <unistd.h>
-#include <getopt.h>
-#include <iconv.h>
-#include <langinfo.h>
+#include "request.h"
+#include "common_sg.h"
+#include "sg_error_codes.h"
+
+#include "stg/user_conf.h"
+#include "stg/user_stat.h"
+#include "stg/common.h"
#include <cerrno>
#include <clocale>
#include <cstdio>
+#include <cstdlib>
#include <cstring>
#include <string>
#include <sstream>
-#include "stg/common.h"
-#include "request.h"
-#include "common_sg.h"
-#include "sg_error_codes.h"
+#include <unistd.h>
+#include <getopt.h>
+#include <iconv.h>
+#include <langinfo.h>
namespace
{
template <typename T>
-struct ARRAY_TYPE;
+struct ARRAY_TYPE
+{
+typedef typename T::value_type type;
+};
template <typename T>
struct ARRAY_TYPE<T[]>
{"email", 1, 0, 'L'}, //emaiL
{"phone", 1, 0, 'P'}, //phone
{"group", 1, 0, 'G'}, //Group
-{"ip", 0, 0, 'I'}, //IP-address of user
+{"ip", 0, 0, 'I'}, //IP-address of user
{0, 0, 0, 0}};
//-----------------------------------------------------------------------------
-double ParseCash(const char * c, string * message)
+CASH_INFO ParseCash(const char * str)
{
//-c 123.45:log message
-double cash;
-char * msg;
-char * str;
-str = new char[strlen(c) + 1];
-
-strncpy(str, c, strlen(c));
-str[strlen(c)] = 0;
-
-msg = strchr(str, ':');
-
-if (msg)
+std::string cashString;
+std::string message;
+const char * pos = strchr(str, ':');
+if (pos != NULL)
{
- *message = msg + 1;
- str[msg - str] = 0;
+ cashString.append(str, pos);
+ message.append(pos + 1);
}
else
- *message = "";
+ cashString = str;
-if (strtodouble2(str, cash) != 0)
+double cash = 0;
+if (strtodouble2(cashString, cash) != 0)
{
- printf("Incorrect cash value %s\n", c);
+ printf("Incorrect cash value %s\n", str);
exit(PARAMETER_PARSING_ERR_CODE);
}
-delete[] str;
-return cash;
+return CASH_INFO(cash, message);
}
//-----------------------------------------------------------------------------
double ParseCredit(const char * c)
return dp[0] - '0';
}
//-----------------------------------------------------------------------------
-string ParseTariff(const char * t, int &chgType)
+void ParseTariff(const char * str, RESETABLE<std::string> & tariffName, RESETABLE<std::string> & nextTariff)
{
-int l = strlen(t);
-char * s;
-s = new char[l];
-char * s1, * s2;
-string ss;
-
-strcpy(s, t);
-
-s1 = strtok(s, ":");
-
-if (strlen(s1) >= TARIFF_NAME_LEN)
+const char * pos = strchr(str, ':');
+if (pos != NULL)
{
- printf("Tariff name too big %s\n", s1);
- exit(PARAMETER_PARSING_ERR_CODE);
- }
-
-//*tariff = s;
-
-if (CheckLogin(s1))
- {
- printf("Incorrect tariff value %s\n", t);
- exit(PARAMETER_PARSING_ERR_CODE);
- }
-
-s2 = strtok(NULL, ":");
-
-chgType = -1;
-
-if (s2 == NULL)
- {
- chgType = TARIFF_NOW;
- ss = s;
- delete[] s;
- return ss;
- }
-
-
-if (strcmp(s2, "now") == 0)
- chgType = TARIFF_NOW;
-
-if (strcmp(s2, "delayed") == 0)
- chgType = TARIFF_DEL;
-
-if (strcmp(s2, "recalc") == 0)
- chgType = TARIFF_REC;
-
-if (chgType < 0)
- {
- printf("Incorrect tariff value %s\n", t);
- exit(PARAMETER_PARSING_ERR_CODE);
+ std::string tariff(str, pos);
+ if (strcmp(pos + 1, "now") == 0)
+ tariffName = tariff;
+ else if (strcmp(pos + 1, "delayed") == 0)
+ nextTariff = tariff;
+ else
+ {
+ printf("Incorrect tariff value '%s'. Should be '<tariff>', '<tariff>:now' or '<tariff>:delayed'.\n", str);
+ exit(PARAMETER_PARSING_ERR_CODE);
+ }
}
-
-ss = s;
-delete[] s;
-return ss;
+else
+ tariffName = str;
}
//-----------------------------------------------------------------------------
time_t ParseCreditExpire(const char * str)
r[0] = 0;
-if (!req->usrMsg.res_empty())
+if (!req->usrMsg.empty())
{
string msg;
- Encode12str(msg, req->usrMsg);
+ Encode12str(msg, req->usrMsg.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);
strcat(r, str);
}
-if (!req->setCash.res_empty())
+if (!req->setCash.empty())
{
string msg;
Encode12str(msg, req->message);
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->monthUpload[i].res_empty())
+ if (!req->monthUpload[i].empty())
{
if (!uPresent && !dPresent)
{
sprintf(str, "MU%d=\"%s\" ", i, ss.str().c_str());
strcat(r, str);
}
- if (!req->monthDownload[i].res_empty())
+ if (!req->monthDownload[i].empty())
{
if (!uPresent && !dPresent)
{
sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str());
strcat(r, str);
}
- if (!req->sessionUpload[i].res_empty())
+ if (!req->sessionUpload[i].empty())
{
if (!uPresent && !dPresent)
{
sprintf(str, "MU%d=\"%s\" ", i, ss.str().c_str());
strcat(r, str);
}
- if (!req->sessionDownload[i].res_empty())
+ if (!req->sessionDownload[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.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.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.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.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.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.data());
sprintf(str, "<group value=\"%s\"/>", group.c_str());
strcat(r, str);
}
for (int i = 0; i < USERDATA_NUM; i++)
{
- if (!req->userData[i].res_empty())
+ if (!req->userData[i].empty())
{
string ud;
- Encode12str(ud, req->userData[i]);
+ Encode12str(ud, req->userData[i].data());
sprintf(str, "<userdata%d value=\"%s\"/>", i, ud.c_str());
strcat(r, str);
}
bool mu = false;
bool md = false;
bool ud = false;
-bool a = !req->admLogin.res_empty()
- && !req->admPasswd.res_empty()
- && !req->server.res_empty()
- && !req->port.res_empty()
- && !req->login.res_empty();
-
-bool 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
+bool a = !req->admLogin.empty()
+ && !req->admPasswd.empty()
+ && !req->server.empty()
+ && !req->port.empty()
+ && !req->login.empty();
+
+bool 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->sessionUpload[i].res_empty())
+ if (req->sessionUpload[i].empty())
{
su = true;
break;
for (int i = 0; i < DIR_NUM; i++)
{
- if (req->sessionDownload[i].res_empty())
+ if (req->sessionDownload[i].empty())
{
sd = true;
break;
for (int i = 0; i < DIR_NUM; i++)
{
- if (req->monthUpload[i].res_empty())
+ if (req->monthUpload[i].empty())
{
mu = true;
break;
for (int i = 0; i < DIR_NUM; i++)
{
- if (req->monthDownload[i].res_empty())
+ if (req->monthDownload[i].empty())
{
md = true;
break;
for (int i = 0; i < DIR_NUM; i++)
{
- if (req->userData[i].res_empty())
+ if (req->userData[i].empty())
{
ud = true;
break;
}
if (req.authBy)
- return ProcessAuthBy(req.server, req.port, req.admLogin, req.admPasswd, req.login);
+ return ProcessAuthBy(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data());
else
- return ProcessGetUser(req.server, req.port, req.admLogin, req.admPasswd, req.login, req);
+ return ProcessGetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req);
}
//-----------------------------------------------------------------------------
bool mainSet(int argc, char **argv)
int missedOptionArg = false;
+USER_CONF_RES conf;
+USER_STAT_RES stat;
while (1)
{
int option_index = -1;
break;
case 'o': //change user password
- req.usrPasswd = ParsePassword(optarg);
+ conf.password = ParsePassword(optarg);
break;
case 'u': //user
break;
case 'c': //add cash
- req.cash = ParseCash(optarg, &req.message);
+ stat.cashAdd = ParseCash(optarg);
break;
case 'v': //set cash
- req.setCash = ParseCash(optarg, &req.message);
+ stat.cashSet = ParseCash(optarg);
break;
case 'r': //credit
- req.credit = ParseCredit(optarg);
+ conf.credit = ParseCredit(optarg);
break;
case 'E': //credit expire
- req.creditExpire = ParseCreditExpire(optarg);
+ conf.creditExpire = ParseCreditExpire(optarg);
break;
case 'd': //down
- req.down = ParseDownPassive(optarg);
+ conf.disabled = ParseDownPassive(optarg);
break;
case 'i': //passive
- req.passive = ParseDownPassive(optarg);
+ conf.passive = ParseDownPassive(optarg);
break;
case 't': //tariff
- req.tariff = ParseTariff(optarg, req.chgTariff);
+ ParseTariff(optarg, conf.tariffName, conf.nextTariff);
break;
case 'm': //message
break;
case 'e': //Prepaid Traffic
- req.prepaidTraff = ParsePrepaidTraffic(optarg);
+ stat.freeMb = ParsePrepaidTraffic(optarg);
break;
case 'n': //Create User
case 'N': //Note
ParseAnyString(optarg, &str, "koi8-ru");
- req.note = str;
+ conf.note = str;
break;
case 'A': //nAme
ParseAnyString(optarg, &str, "koi8-ru");
- req.name = str;
+ conf.realName = str;
break;
case 'D': //aDdress
ParseAnyString(optarg, &str, "koi8-ru");
- req.address = str;
+ conf.address = str;
break;
case 'L': //emaiL
ParseAnyString(optarg, &str, "koi8-ru");
- req.email = str;
- //printf("EMAIL=%s\n", optarg);
+ conf.email = str;
break;
case 'P': //phone
ParseAnyString(optarg, &str);
- req.phone = str;
+ conf.phone = str;
break;
case 'G': //Group
ParseAnyString(optarg, &str, "koi8-ru");
- req.group = str;
+ conf.group = str;
break;
case 'I': //IP-address of user
ParseAnyString(optarg, &str);
- req.ips = str;
+ conf.ips = StrToIPS(str);
break;
case 'S':
- req.disableDetailStat = ParseDownPassive(optarg);
+ conf.disabledDetailStat = ParseDownPassive(optarg);
break;
case 'O':
- req.alwaysOnline = ParseDownPassive(optarg);
+ conf.alwaysOnline = ParseDownPassive(optarg);
break;
case 500: //U
- SetArrayItem(req.sessionUpload, optarg, ParseTraff(argv[optind++]));
- //req.sessionUpload[optarg] = ParseTraff(argv[optind++]);
+ SetArrayItem(stat.sessionUp, optarg, ParseTraff(argv[optind++]));
break;
case 501:
- SetArrayItem(req.sessionDownload, optarg, ParseTraff(argv[optind++]));
- //req.sessionDownload[optarg] = ParseTraff(argv[optind++]);
+ SetArrayItem(stat.sessionDown, optarg, ParseTraff(argv[optind++]));
break;
case 502:
- SetArrayItem(req.monthUpload, optarg, ParseTraff(argv[optind++]));
- //req.monthUpload[optarg] = ParseTraff(argv[optind++]);
+ SetArrayItem(stat.monthUp, optarg, ParseTraff(argv[optind++]));
break;
case 503:
- SetArrayItem(req.monthDownload, optarg, ParseTraff(argv[optind++]));
- //req.monthDownload[optarg] = ParseTraff(argv[optind++]);
+ SetArrayItem(stat.monthDown, optarg, ParseTraff(argv[optind++]));
break;
case 700: //UserData
ParseAnyString(argv[optind++], &str);
- SetArrayItem(req.userData, optarg, str);
- //req.userData[optarg] = str;
+ SetArrayItem(conf.userdata, optarg, str);
break;
case '?':
char rstr[rLen];
memset(rstr, 0, rLen);
-CreateRequestSet(&req, rstr);
if (isMessage)
- return ProcessSendMessage(req.server, req.port, req.admLogin, req.admPasswd, rstr);
+ return ProcessSendMessage(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req.usrMsg.data());
-return ProcessSetUser(req.server, req.port, req.admLogin, req.admPasswd, rstr);
+return ProcessSetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), conf, stat);
}
//-----------------------------------------------------------------------------
int main(int argc, char **argv)
git.stg.codes / stg.git / blobdiff