$Date: 2009/06/08 10:02:28 $
*/
+#include "stg/common.h"
+#include "sg_error_codes.h"
+#include "common_sg.h"
+#include "version_sg.h"
#include <stdio.h>
#include <string.h>
#include <iostream>
#include <iconv.h>
-#include "stg/common.h"
-#include "sg_error_codes.h"
-#include "common_sg.h"
-#include "version_sg.h"
-
using namespace std;
const int usageConf = 0;
{"set credit expire", "get credit expire", "-E", "<credit_expire_date>"},
{"set password", "get password", "-o", "<new_password>"},
{"set prepaid traffic", "get prepaid traffic", "-e", "<prepaid>"},
- {"set IP-addresses", "get IP-addresses", "-I", "<*|ip_addr[,ip_addr...]>"},
+ {"set IP-addresses", "get IP-addresses", "-I", "<*|ip_addr[,ip_addr...]>"},
{"set name", "get name", "-A", "<name>"},
{"set note", "get note", "-N", "<note>"},
{"set street address", "get street address", "-D", "<address>"},
printf("sgconf get -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> --ud0 [--ud1 ...]\n\n");
printf("To get user's authorizers list use:\n");
-printf("sgconf get -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> --authorized-by\n");
+printf("sgconf get -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> --authorized-by\n\n");
printf("To send message use:\n");
printf("sgconf set -s <server> -p <port> -a <admin> -w <admin_pass> -u <user> -m <message>\n\n");
void ConvertKOI8(const string & src, string * dst, int encType)
{
iconv_t cd;
-char * ob = new char[src.size() * 2 + 1];
-char * ib = new char[src.size() + 1];
-
-strcpy(ib, src.c_str());
-
-char * outbuf = ob;
-char * inbuf = ib;
setlocale(LC_ALL, "");
size_t nconv = 1;
-size_t insize = strlen(ib);
-size_t outsize = insize * 2 + 1;
-
-insize = src.size();
-
cd = iconv_open(charsetT, charsetF);
if (cd == (iconv_t) -1)
{
exit(ICONV_ERR_CODE);
}
-#if defined(FREE_BSD) || defined(FREE_BSD5)
+char * ob = new char[src.size() * 2 + 1];
+char * ib = new char[src.size() + 1];
+
+strcpy(ib, src.c_str());
+
+char * outbuf = ob;
+char * inbuf = ib;
+
+size_t insize = strlen(ib);
+size_t outsize = insize * 2 + 1;
+
+insize = src.size();
+
+#if defined(CONST_ICONV)
nconv = iconv(cd, (const char **)&inbuf, &insize, &outbuf, &outsize);
#else
nconv = iconv(cd, &inbuf, &insize, &outbuf, &outsize);
//-----------------------------------------------------------------------------
int RecvSetUserAnswer(const char * ans, void * d)
{
-GetUserCbData * gucbd;
-gucbd = (GetUserCbData *)d;
+GetUserCbData * gucbd = static_cast<GetUserCbData*>(d);
bool * result = gucbd->result;
-//REQUEST * req = (REQUEST *)gucbd->data;
-
-//printf("ans=%s\n", ans);
if (strcasecmp("Ok", ans) == 0)
*result = true;
else
//-----------------------------------------------------------------------------
void RecvUserData(USERDATA * ud, void * d)
{
-GetUserCbData * gucbd;
-gucbd = (GetUserCbData *)d;
+GetUserCbData * gucbd = static_cast<GetUserCbData*>(d);
bool * result = gucbd->result;
return;
}
-if (!req->cash.res_empty())
+if (!req->cash.empty())
cout << "cash=" << ud->cash << endl;
-if (!req->credit.res_empty())
+if (!req->credit.empty())
cout << "credit=" << ud->credit << endl;
-if (!req->creditExpire.res_empty())
+if (!req->creditExpire.empty())
{
char buf[32];
struct tm brokenTime;
cout << "creditExpire=" << buf << endl;
}
-if (!req->down.res_empty())
+if (!req->down.empty())
cout << "down=" << ud->down << endl;
-if (!req->passive.res_empty())
+if (!req->passive.empty())
cout << "passive=" << ud->passive << endl;
-if (!req->disableDetailStat.res_empty())
+if (!req->disableDetailStat.empty())
cout << "disableDetailStat=" << ud->disableDetailStat << endl;
-if (!req->alwaysOnline.res_empty())
+if (!req->alwaysOnline.empty())
cout << "alwaysOnline=" << ud->alwaysOnline << endl;
-if (!req->prepaidTraff.res_empty())
+if (!req->prepaidTraff.empty())
cout << "prepaidTraff=" << ud->prepaidTraff << endl;
for (int i = 0; i < DIR_NUM; i++)
{
- if (!req->u[i].res_empty())
+ if (!req->u[i].empty())
cout << "u" << i << "=" << ud->stat.mu[i] << endl;
- if (!req->d[i].res_empty())
+ if (!req->d[i].empty())
cout << "d" << i << "=" << ud->stat.md[i] << endl;
}
for (int i = 0; i < USERDATA_NUM; i++)
{
- if (!req->ud[i].res_empty())
+ if (!req->ud[i].empty())
{
string str;
ConvertFromKOI8(ud->userData[i], &str);
{"group", req->group, &ud->group},
{"tariff", req->tariff, &ud->tariff},
{"password", req->usrPasswd, &ud->password},
- {"ip", req->ips, &ud->ips} // IP-address of user
+ {"ip", req->ips, &ud->ips} // IP-address of user
};
for (unsigned i = 0; i < sizeof(strReqParams) / sizeof(StringReqParams); i++)
{
- if (!strReqParams[i].reqParam.res_empty())
+ if (!strReqParams[i].reqParam.empty())
{
string str;
ConvertFromKOI8(*strReqParams[i].value, &str);
//-----------------------------------------------------------------------------
void RecvAuthByData(const std::vector<std::string> & list, void * d)
{
-AuthByCbData * abcbd;
-abcbd = (AuthByCbData *)d;
+AuthByCbData * abcbd = static_cast<AuthByCbData*>(d);
bool * result = abcbd->result;
-REQUEST * req = (REQUEST *)abcbd->data;
-
for (std::vector<std::string>::const_iterator it = list.begin(); it != list.end(); ++it)
cout << *it << "\n";
cout << endl;