$Date: 2010/03/25 14:37:43 $
*/
-#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 <unistd.h>
+#include <getopt.h>
+#include <iconv.h>
+#include <langinfo.h>
#include <cerrno>
#include <clocale>
#include <cstdio>
-#include <cstdlib>
#include <cstring>
#include <string>
+#include <list>
#include <sstream>
-#include <unistd.h>
-#include <getopt.h>
-#include <iconv.h>
-#include <langinfo.h>
-
-namespace
-{
-
-template <typename T>
-struct ARRAY_TYPE
-{
-typedef typename T::value_type type;
-};
-
-template <typename T>
-struct ARRAY_TYPE<T[]>
-{
-typedef T type;
-};
-
-template <typename T, size_t N>
-struct ARRAY_TYPE<T[N]>
-{
-typedef T type;
-};
-
-template <typename T>
-bool SetArrayItem(T & array, const char * index, const typename ARRAY_TYPE<T>::type & value)
-{
-size_t pos = 0;
-if (str2x(index, pos))
- return false;
-array[pos] = value;
-return true;
-}
+#include "stg/common.h"
+#include "stg/netunit.h"
+#include "request.h"
+#include "common_sg.h"
+#include "sg_error_codes.h"
-} // namespace anonymous
+using namespace std;
time_t stgTime;
+int ParseReplyGet(void * data, list<string> * ans);
+//int ParseReplySet(void * data, list<string> * ans);
+
struct option long_options_get[] = {
{"server", 1, 0, 's'}, //Server
{"port", 1, 0, 'p'}, //Port
{"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
{"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}};
//-----------------------------------------------------------------------------
-CASH_INFO ParseCash(const char * str)
+double ParseCash(const char * c, string * message)
{
//-c 123.45:log message
-std::string cashString;
-std::string message;
-const char * pos = strchr(str, ':');
-if (pos != NULL)
+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)
{
- cashString.append(str, pos);
- message.append(pos + 1);
+ *message = msg + 1;
+ str[msg - str] = 0;
}
else
- cashString = str;
+ *message = "";
-double cash = 0;
-if (strtodouble2(cashString, cash) != 0)
+if (strtodouble2(str, cash) != 0)
{
- printf("Incorrect cash value %s\n", str);
+ printf("Incorrect cash value %s\n", c);
exit(PARAMETER_PARSING_ERR_CODE);
}
-return CASH_INFO(cash, message);
+delete[] str;
+return cash;
}
//-----------------------------------------------------------------------------
double ParseCredit(const char * c)
return dp[0] - '0';
}
//-----------------------------------------------------------------------------
-void ParseTariff(const char * str, RESETABLE<std::string> & tariffName, RESETABLE<std::string> & nextTariff)
+string ParseTariff(const char * t, int &chgType)
{
-const char * pos = strchr(str, ':');
-if (pos != NULL)
+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)
{
- 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);
- }
+ printf("Tariff name too big %s\n", s1);
+ exit(PARAMETER_PARSING_ERR_CODE);
}
-else
- tariffName = str;
+
+//*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);
+ }
+
+ss = s;
+delete[] s;
+return ss;
}
//-----------------------------------------------------------------------------
time_t ParseCreditExpire(const char * str)
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);
if (!req->usrMsg.empty())
{
string msg;
- Encode12str(msg, req->usrMsg.data());
+ 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);
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.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);
}
int dPresent = false;
for (int i = 0; i < DIR_NUM; i++)
{
- if (!req->monthUpload[i].empty())
+ if (!req->u[i].empty())
{
if (!uPresent && !dPresent)
{
}
stringstream ss;
- ss << req->monthUpload[i].const_data();
+ ss << req->u[i].const_data();
//sprintf(str, "MU%d=\"%lld\" ", i, req->u[i].const_data());
sprintf(str, "MU%d=\"%s\" ", i, ss.str().c_str());
strcat(r, str);
}
- if (!req->monthDownload[i].empty())
+ if (!req->d[i].empty())
{
if (!uPresent && !dPresent)
{
}
stringstream ss;
- ss << req->monthDownload[i].const_data();
- sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str());
- strcat(r, str);
- }
- if (!req->sessionUpload[i].empty())
- {
- if (!uPresent && !dPresent)
- {
- sprintf(str, "<traff ");
- strcat(r, str);
- uPresent = true;
- }
-
- stringstream ss;
- ss << req->sessionUpload[i].const_data();
- //sprintf(str, "MU%d=\"%lld\" ", i, req->u[i].const_data());
- sprintf(str, "MU%d=\"%s\" ", i, ss.str().c_str());
- strcat(r, str);
- }
- if (!req->sessionDownload[i].empty())
- {
- if (!uPresent && !dPresent)
- {
- sprintf(str, "<traff ");
- strcat(r, str);
- dPresent = true;
- }
-
- stringstream ss;
- ss << req->sessionDownload[i].const_data();
+ ss << req->d[i].const_data();
sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str());
strcat(r, str);
}
if (!req->note.empty())
{
string note;
- Encode12str(note, req->note.data());
+ Encode12str(note, req->note.const_data());
sprintf(str, "<note value=\"%s\"/>", note.c_str());
strcat(r, str);
}
if (!req->name.empty())
{
string name;
- Encode12str(name, req->name.data());
+ Encode12str(name, req->name.const_data());
sprintf(str, "<name value=\"%s\"/>", name.c_str());
strcat(r, str);
}
if (!req->address.empty())
{
string address;
- Encode12str(address, req->address.data());
+ Encode12str(address, req->address.const_data());
sprintf(str, "<address value=\"%s\"/>", address.c_str());
strcat(r, str);
}
if (!req->email.empty())
{
string email;
- Encode12str(email, req->email.data());
+ Encode12str(email, req->email.const_data());
sprintf(str, "<email value=\"%s\"/>", email.c_str());
strcat(r, str);
}
if (!req->phone.empty())
{
string phone;
- Encode12str(phone, req->phone.data());
+ Encode12str(phone, req->phone.const_data());
sprintf(str, "<phone value=\"%s\"/>", phone.c_str());
strcat(r, str);
}
if (!req->group.empty())
{
string group;
- Encode12str(group, req->group.data());
+ 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->userData[i].empty())
+ if (!req->ud[i].empty())
{
string ud;
- Encode12str(ud, req->userData[i].data());
+ Encode12str(ud, req->ud[i].const_data());
sprintf(str, "<userdata%d value=\"%s\"/>", i, ud.c_str());
strcat(r, str);
}
//-----------------------------------------------------------------------------
int CheckParameters(REQUEST * req)
{
-bool su = false;
-bool sd = false;
-bool mu = false;
-bool md = false;
-bool ud = false;
-bool a = !req->admLogin.empty()
+int u = false;
+int d = false;
+int ud = false;
+int a = !req->admLogin.empty()
&& !req->admPasswd.empty()
&& !req->server.empty()
&& !req->port.empty()
&& !req->login.empty();
-bool b = !req->cash.empty()
+int b = !req->cash.empty()
|| !req->setCash.empty()
|| !req->credit.empty()
|| !req->prepaidTraff.empty()
|| !req->email.empty()
|| !req->phone.empty()
|| !req->group.empty()
- || !req->ips.empty() // IP-address of user
+ || !req->ips.empty() // IP-address of user
|| !req->createUser
|| !req->deleteUser;
for (int i = 0; i < DIR_NUM; i++)
{
- if (req->sessionUpload[i].empty())
- {
- su = true;
- break;
- }
- }
-
-for (int i = 0; i < DIR_NUM; i++)
- {
- if (req->sessionDownload[i].empty())
- {
- sd = true;
- break;
- }
- }
-
-for (int i = 0; i < DIR_NUM; i++)
- {
- if (req->monthUpload[i].empty())
+ if (req->u[i].empty())
{
- mu = true;
+ u = true;
break;
}
}
for (int i = 0; i < DIR_NUM; i++)
{
- if (req->monthDownload[i].empty())
+ if (req->d[i].empty())
{
- md = true;
+ d = true;
break;
}
}
for (int i = 0; i < DIR_NUM; i++)
{
- if (req->userData[i].empty())
+ if (req->ud[i].empty())
{
ud = true;
break;
//printf("a=%d, b=%d, u=%d, d=%d ud=%d\n", a, b, u, d, ud);
-return a && (b || su || sd || mu || md || ud);
+return a && (b || u || d || ud);
}
//-----------------------------------------------------------------------------
int CheckParametersGet(REQUEST * req)
return CheckParameters(req);
}
//-----------------------------------------------------------------------------
-bool mainGet(int argc, char **argv)
+int mainGet(int argc, char **argv)
{
int c;
REQUEST req;
case 'G': //Group
req.group = " ";
break;
-
- case 'I': //IP-address of user
- req.ips = " ";
- break;
+
+ case 'I': //IP-address of user
+ req.ips = " ";
+ break;
case 'S': //Detail stat status
req.disableDetailStat = " ";
break;
case 500: //U
- SetArrayItem(req.sessionUpload, optarg, 1);
- //req.sessionUpload[optarg] = 1;
- break;
case 501:
- SetArrayItem(req.sessionDownload, optarg, 1);
- //req.sessionDownload[optarg] = 1;
- break;
case 502:
- SetArrayItem(req.monthUpload, optarg, 1);
- //req.monthUpload[optarg] = 1;
- break;
case 503:
- SetArrayItem(req.monthDownload, optarg, 1);
- //req.monthDownload[optarg] = 1;
+ case 504:
+ case 505:
+ case 506:
+ case 507:
+ case 508:
+ case 509:
+ //printf("U%d\n", c - 500);
+ 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
- SetArrayItem(req.userData, optarg, std::string(" "));
- //req.userData[optarg] = " ";
+ 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[c - 700] = " ";
break;
case 800:
case '?':
case ':':
+ //printf ("Unknown option \n");
missedOptionArg = true;
break;
}
if (req.authBy)
- return ProcessAuthBy(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data());
+ 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.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req);
+ return ProcessGetUser(req.server.const_data(), req.port.const_data(), req.admLogin.const_data(), req.admPasswd.const_data(), req.login.const_data(), &req);
}
//-----------------------------------------------------------------------------
-bool mainSet(int argc, char **argv)
+int mainSet(int argc, char **argv)
{
string str;
int missedOptionArg = false;
-USER_CONF_RES conf;
-USER_STAT_RES stat;
while (1)
{
int option_index = -1;
break;
case 'o': //change user password
- conf.password = ParsePassword(optarg);
+ req.usrPasswd = ParsePassword(optarg);
break;
case 'u': //user
break;
case 'c': //add cash
- stat.cashAdd = ParseCash(optarg);
+ req.cash = ParseCash(optarg, &req.message);
break;
case 'v': //set cash
- stat.cashSet = ParseCash(optarg);
+ req.setCash = ParseCash(optarg, &req.message);
break;
case 'r': //credit
- conf.credit = ParseCredit(optarg);
+ req.credit = ParseCredit(optarg);
break;
case 'E': //credit expire
- conf.creditExpire = ParseCreditExpire(optarg);
+ req.creditExpire = ParseCreditExpire(optarg);
break;
case 'd': //down
- conf.disabled = ParseDownPassive(optarg);
+ req.down = ParseDownPassive(optarg);
break;
case 'i': //passive
- conf.passive = ParseDownPassive(optarg);
+ req.passive = ParseDownPassive(optarg);
break;
case 't': //tariff
- ParseTariff(optarg, conf.tariffName, conf.nextTariff);
+ req.tariff = ParseTariff(optarg, req.chgTariff);
break;
case 'm': //message
break;
case 'e': //Prepaid Traffic
- stat.freeMb = ParsePrepaidTraffic(optarg);
+ req.prepaidTraff = ParsePrepaidTraffic(optarg);
break;
case 'n': //Create User
case 'N': //Note
ParseAnyString(optarg, &str, "koi8-ru");
- conf.note = str;
+ req.note = str;
break;
case 'A': //nAme
ParseAnyString(optarg, &str, "koi8-ru");
- conf.realName = str;
+ req.name = str;
break;
case 'D': //aDdress
ParseAnyString(optarg, &str, "koi8-ru");
- conf.address = str;
+ req.address = str;
break;
case 'L': //emaiL
ParseAnyString(optarg, &str, "koi8-ru");
- conf.email = str;
+ req.email = str;
+ //printf("EMAIL=%s\n", optarg);
break;
case 'P': //phone
- ParseAnyString(optarg, &str);
- conf.phone = str;
+ ParseAnyString(optarg, &str, "koi8-ru");
+ req.phone = str;
break;
case 'G': //Group
ParseAnyString(optarg, &str, "koi8-ru");
- conf.group = str;
+ req.group = str;
break;
case 'I': //IP-address of user
ParseAnyString(optarg, &str);
- conf.ips = StrToIPS(str);
+ req.ips = str;
break;
case 'S':
- conf.disabledDetailStat = ParseDownPassive(optarg);
+ req.disableDetailStat = ParseDownPassive(optarg);
break;
case 'O':
- conf.alwaysOnline = ParseDownPassive(optarg);
+ req.alwaysOnline = ParseDownPassive(optarg);
break;
case 500: //U
- SetArrayItem(stat.sessionUp, optarg, ParseTraff(argv[optind++]));
- break;
case 501:
- SetArrayItem(stat.sessionDown, optarg, ParseTraff(argv[optind++]));
- break;
case 502:
- SetArrayItem(stat.monthUp, optarg, ParseTraff(argv[optind++]));
- break;
case 503:
- SetArrayItem(stat.monthDown, optarg, ParseTraff(argv[optind++]));
+ case 504:
+ case 505:
+ case 506:
+ case 507:
+ case 508:
+ case 509:
+ //printf("U%d\n", c - 500);
+ 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);
- SetArrayItem(conf.userdata, optarg, 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.ud[c - 700] = str;
break;
case '?':
+ //printf("Missing option argument\n");
missedOptionArg = true;
break;
case ':':
+ //printf("Missing option argument\n");
missedOptionArg = true;
break;
char rstr[rLen];
memset(rstr, 0, rLen);
-if (isMessage)
- return ProcessSendMessage(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req.usrMsg.data());
-
-return ProcessSetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), conf, stat);
+CreateRequestSet(&req, rstr);
+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)
else if (strcmp(argv[1], "set") == 0)
{
//printf("set\n");
- if (mainSet(argc - 1, argv + 1) )
- return 0;
- return -1;
+ return mainSet(argc - 1, argv + 1);
}
else
{
git.stg.codes / stg.git / blobdiff