#include <list>
#include <sstream>
+#include "stg/common.h"
+#include "stg/netunit.h"
#include "request.h"
-#include "common.h"
-#include "netunit.h"
#include "common_sg.h"
#include "sg_error_codes.h"
{"email", 0, 0, 'L'}, //emaiL
{"phone", 0, 0, 'P'}, //phone
{"group", 0, 0, 'G'}, //Group
-{"ip", 0, 0, 'I'}, //IP-address of user
+{"ip", 0, 0, 'I'}, //IP-address of user
+{"authorized-by",0, 0, 800}, //always online
{0, 0, 0, 0}};
double cash;
char * msg;
char * str;
-str = new char[strlen(c)];
+str = new char[strlen(c) + 1];
+
+strncpy(str, c, strlen(c));
+str[strlen(c)] = 0;
-strcpy(str, c);
msg = strchr(str, ':');
if (msg)
return ss;
}
//-----------------------------------------------------------------------------
+time_t ParseCreditExpire(const char * str)
+{
+struct tm brokenTime;
+
+brokenTime.tm_wday = 0;
+brokenTime.tm_yday = 0;
+brokenTime.tm_isdst = 0;
+brokenTime.tm_hour = 0;
+brokenTime.tm_min = 0;
+brokenTime.tm_sec = 0;
+
+stg_strptime(str, "%Y-%m-%d", &brokenTime);
+
+return stg_timegm(&brokenTime);
+}
+//-----------------------------------------------------------------------------
void ParseAnyString(const char * c, string * msg, const char * enc)
{
iconv_t cd;
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->prepaidTraff.res_empty())
+if (!req->creditExpire.empty())
+ {
+ sprintf(str, "<creditExpire value=\"%ld\"/>\n", req->creditExpire.const_data());
+ strcat(r, str);
+ }
+
+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;
RESETABLE<string> t1;
int missedOptionArg = false;
-const char * short_options_get = "s:p:a:w:u:crtmodieNADLPGISO";
+const char * short_options_get = "s:p:a:w:u:crtmodieNADLPGISOE";
int option_index = -1;
while (1)
req.credit = 1;
break;
+ case 'E': //credit expire
+ req.creditExpire = 1;
+ break;
+
case 'd': //down
req.down = 1;
break;
req.ud[c - 700] = " ";
break;
+ case 800:
+ req.authBy = true;
+ break;
+
case '?':
case ':':
//printf ("Unknown option \n");
exit(PARAMETER_PARSING_ERR_CODE);
}
-return ProcessGetUser(req.server, req.port, req.admLogin, req.admPasswd, req.login, &req);
+if (req.authBy)
+ 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.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)
RESETABLE<string> t1;
-const char * short_options_set = "s:p:a:w:u:c:r:t:m:o:d:i:e:v:nlN:A:D:L:P:G:I:S:O:";
+const char * short_options_set = "s:p:a:w:u:c:r:t:m:o:d:i:e:v:nlN:A:D:L:P:G:I:S:O:E:";
int missedOptionArg = false;
req.credit = ParseCredit(optarg);
break;
+ case 'E': //credit expire
+ req.creditExpire = ParseCreditExpire(optarg);
+ break;
+
case 'd': //down
req.down = ParseDownPassive(optarg);
break;
break;
case 'N': //Note
- ParseAnyString(optarg, &str);
+ ParseAnyString(optarg, &str, "koi8-ru");
req.note = str;
break;
case 'A': //nAme
- ParseAnyString(optarg, &str, "koi8-r");
+ ParseAnyString(optarg, &str, "koi8-ru");
req.name = str;
break;
case 'D': //aDdress
- ParseAnyString(optarg, &str);
+ ParseAnyString(optarg, &str, "koi8-ru");
req.address = str;
break;
case 'L': //emaiL
- ParseAnyString(optarg, &str);
+ ParseAnyString(optarg, &str, "koi8-ru");
req.email = str;
//printf("EMAIL=%s\n", optarg);
break;
case 'P': //phone
- ParseAnyString(optarg, &str);
+ ParseAnyString(optarg, &str, "koi8-ru");
req.phone = str;
break;
case 'G': //Group
- ParseAnyString(optarg, &str);
+ ParseAnyString(optarg, &str, "koi8-ru");
req.group = str;
break;
case 707:
case 708:
case 709:
- ParseAnyString(optarg, &str);
+ ParseAnyString(optarg, &str, "koi8-ru");
//printf("UD%d\n", c - 700);
req.ud[c - 700] = str;
break;
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