Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / sgconf / main.cpp

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index d2671be4b9552084ba77c0934dccfd40fed9c473..20c7ef519f48dbdb7483f03ae3857e0975d2e2ad 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -24,10 +24,11 @@
  $Date: 2010/03/25 14:37:43 $
  */
 
  $Date: 2010/03/25 14:37:43 $
  */
 

-#include <unistd.h>
-#include <getopt.h>
-#include <iconv.h>
-#include <langinfo.h>
+#include "stg/common.h"
+#include "stg/netunit.h"
+#include "request.h"
+#include "common_sg.h"
+#include "sg_error_codes.h"

 
 #include <cerrno>
 #include <clocale>
 
 #include <cerrno>
 #include <clocale>


@@ -37,18 +38,16 @@
 #include <list>
 #include <sstream>
 
 #include <list>
 #include <sstream>
 

-#include "request.h"
-#include "common.h"
-#include "netunit.h"
-#include "common_sg.h"
-#include "sg_error_codes.h"
+#include <unistd.h>
+#include <getopt.h>
+#include <iconv.h>
+#include <langinfo.h>

 
 using namespace std;
 
 time_t stgTime;
 
 int ParseReplyGet(void * data, list<string> * ans);
 
 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
 
 struct option long_options_get[] = {
 {"server",      1, 0, 's'},  //Server


@@ -57,7 +56,6 @@ struct option long_options_get[] = {
 {"admin_pass",  1, 0, 'w'},  //passWord
 {"user",        1, 0, 'u'},  //User
 {"addcash",     0, 0, 'c'},  //Add Cash
 {"admin_pass",  1, 0, 'w'},  //passWord
 {"user",        1, 0, 'u'},  //User
 {"addcash",     0, 0, 'c'},  //Add Cash

-//{"setcash",     0, 0, 'v'},  //Set Cash

 {"credit",      0, 0, 'r'},  //cRedit
 {"tariff",      0, 0, 't'},  //Tariff
 {"message",     0, 0, 'm'},  //message
 {"credit",      0, 0, 'r'},  //cRedit
 {"tariff",      0, 0, 't'},  //Tariff
 {"message",     0, 0, 'm'},  //message


@@ -108,7 +106,8 @@ struct option long_options_get[] = {
 {"email",       0, 0, 'L'},  //emaiL
 {"phone",       0, 0, 'P'},  //phone
 {"group",       0, 0, 'G'},  //Group
 {"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}};
 
 
 {0, 0, 0, 0}};
 


@@ -170,7 +169,7 @@ struct option long_options_set[] = {
 {"email",       1, 0, 'L'},  //emaiL
 {"phone",       1, 0, 'P'},  //phone
 {"group",       1, 0, 'G'},  //Group
 {"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}};
 
 
 {0, 0, 0, 0}};
 


@@ -181,9 +180,11 @@ double ParseCash(const char * c, string * message)
 double cash;
 char * msg;
 char * str;
 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)
 msg = strchr(str, ':');
 
 if (msg)


@@ -269,8 +270,6 @@ if (strlen(s1) >= TARIFF_NAME_LEN)
     exit(PARAMETER_PARSING_ERR_CODE);
     }
 
     exit(PARAMETER_PARSING_ERR_CODE);
     }
 

-//*tariff = s;
-

 if (CheckLogin(s1))
     {
     printf("Incorrect tariff value %s\n", t);
 if (CheckLogin(s1))
     {
     printf("Incorrect tariff value %s\n", t);


@@ -310,16 +309,25 @@ delete[] s;
 return ss;
 }
 //-----------------------------------------------------------------------------
 return ss;
 }
 //-----------------------------------------------------------------------------

-void ParseAnyString(const char * c, string * msg, const char * enc)
+time_t ParseCreditExpire(const char * str)

 {
 {

-iconv_t cd;
-char * ob = new char[strlen(c) + 1];
-char * ib = new char[strlen(c) + 1];
+struct tm brokenTime;

 
 

-strcpy(ib, c);
+brokenTime.tm_wday = 0;
+brokenTime.tm_yday = 0;
+brokenTime.tm_isdst = 0;
+brokenTime.tm_hour = 0;
+brokenTime.tm_min = 0;
+brokenTime.tm_sec = 0;

 
 

-char * outbuf = ob;
-char * inbuf = ib;
+stg_strptime(str, "%Y-%m-%d", &brokenTime);
+
+return stg_timegm(&brokenTime);
+}
+//-----------------------------------------------------------------------------
+void ParseAnyString(const char * c, string * msg, const char * enc)
+{
+iconv_t cd;

 
 setlocale(LC_ALL, "");
 
 
 setlocale(LC_ALL, "");
 


@@ -330,11 +338,6 @@ const char * charsetT = enc;
 
 size_t nconv = 1;
 
 
 size_t nconv = 1;
 

-size_t insize = strlen(ib);
-size_t outsize = strlen(ib);
-
-insize = strlen(c);
-

 cd = iconv_open(charsetT, charsetF);
 if (cd == (iconv_t) -1)
     {
 cd = iconv_open(charsetT, charsetF);
 if (cd == (iconv_t) -1)
     {


@@ -350,12 +353,22 @@ if (cd == (iconv_t) -1)
     exit(ICONV_ERR_CODE);
     }
 
     exit(ICONV_ERR_CODE);
     }
 

-#if defined(FREE_BSD) || defined(FREE_BSD5)
+char * ob = new char[strlen(c) + 1];
+char * ib = new char[strlen(c) + 1];
+
+strcpy(ib, c);
+
+char * outbuf = ob;
+char * inbuf = ib;
+
+size_t insize = strlen(c);
+size_t outsize = strlen(ib);
+
+#if defined(CONST_ICONV)

 nconv = iconv (cd, (const char**)&inbuf, &insize, &outbuf, &outsize);
 #else
 nconv = iconv (cd, &inbuf, &insize, &outbuf, &outsize);
 #endif
 nconv = iconv (cd, (const char**)&inbuf, &insize, &outbuf, &outsize);
 #else
 nconv = iconv (cd, &inbuf, &insize, &outbuf, &outsize);
 #endif

-//printf("nconv=%d outsize=%d\n", nconv, outsize);

 if (nconv == (size_t) -1)
     {
     if (errno != EINVAL)
 if (nconv == (size_t) -1)
     {
     if (errno != EINVAL)


@@ -382,12 +395,11 @@ memset(str, 0, strLen);
 
 r[0] = 0;
 
 
 r[0] = 0;
 

-if (!req->usrMsg.res_empty())
+if (!req->usrMsg.empty())

     {
     string msg;
     {
     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\" 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);
     return;
     }
     strcat(r, str);
     return;
     }


@@ -396,7 +408,6 @@ if (req->deleteUser)
     {
     sprintf(str, "<DelUser login=\"%s\"/>", req->login.const_data().c_str());
     strcat(r, str);
     {
     sprintf(str, "<DelUser login=\"%s\"/>", req->login.const_data().c_str());
     strcat(r, str);

-    //printf("%s\n", r);

     return;
     }
 
     return;
     }
 


@@ -404,73 +415,78 @@ if (req->createUser)
     {
     sprintf(str, "<AddUser> <login value=\"%s\"/> </AddUser>", req->login.const_data().c_str());
     strcat(r, str);
     {
     sprintf(str, "<AddUser> <login value=\"%s\"/> </AddUser>", req->login.const_data().c_str());
     strcat(r, str);

-    //printf("%s\n", r);

     return;
     }
 
 strcat(r, "<SetUser>\n");
 sprintf(str, "<login value=\"%s\"/>\n", req->login.const_data().c_str());
 strcat(r, str);
     return;
     }
 
 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);
     }
 
     {
     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);
     }
 
     {
     sprintf(str, "<FreeMb value=\"%f\"/>\n", req->prepaidTraff.const_data());
     strcat(r, str);
     }
 

-if (!req->cash.res_empty())
+if (!req->cash.empty())

     {
     string msg;
     {
     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);
     }
 
     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;
     {
     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);
     }
 
     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);
     }
 
     {
     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);
     }
 
     {
     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);
     }
 
     {
     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);
     }
 
     {
     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
     {
     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);
     {
     sprintf(str, "<ip value=\"%s\" />\n", req->ips.const_data().c_str());
     strcat(r, str);


@@ -480,7 +496,7 @@ int uPresent = false;
 int dPresent = false;
 for (int i = 0; i < DIR_NUM; i++)
     {
 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)
             {
         {
         if (!uPresent && !dPresent)
             {


@@ -491,11 +507,10 @@ for (int i = 0; i < DIR_NUM; i++)
 
         stringstream ss;
         ss << req->u[i].const_data();
 
         stringstream ss;
         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);
         }
         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)
             {
         {
         if (!uPresent && !dPresent)
             {


@@ -515,9 +530,7 @@ if (uPresent || dPresent)
     strcat(r, "/>");
     }
 
     strcat(r, "/>");
     }
 

-//printf("%s\n", r);
-
-if (!req->tariff.res_empty())
+if (!req->tariff.empty())

     {
     switch (req->chgTariff)
         {
     {
     switch (req->chgTariff)
         {


@@ -537,60 +550,60 @@ if (!req->tariff.res_empty())
 
     }
 
 
     }
 

-if (!req->note.res_empty())
+if (!req->note.empty())

     {
     string note;
     {
     string note;

-    Encode12str(note, req->note);
+    Encode12str(note, req->note.const_data());

     sprintf(str, "<note value=\"%s\"/>", note.c_str());
     strcat(r, str);
     }
 
     sprintf(str, "<note value=\"%s\"/>", note.c_str());
     strcat(r, str);
     }
 

-if (!req->name.res_empty())
+if (!req->name.empty())

     {
     string name;
     {
     string name;

-    Encode12str(name, req->name);
+    Encode12str(name, req->name.const_data());

     sprintf(str, "<name value=\"%s\"/>", name.c_str());
     strcat(r, str);
     }
 
     sprintf(str, "<name value=\"%s\"/>", name.c_str());
     strcat(r, str);
     }
 

-if (!req->address.res_empty())
+if (!req->address.empty())

     {
     string address;
     {
     string address;

-    Encode12str(address, req->address);
+    Encode12str(address, req->address.const_data());

     sprintf(str, "<address value=\"%s\"/>", address.c_str());
     strcat(r, str);
     }
 
     sprintf(str, "<address value=\"%s\"/>", address.c_str());
     strcat(r, str);
     }
 

-if (!req->email.res_empty())
+if (!req->email.empty())

     {
     string email;
     {
     string email;

-    Encode12str(email, req->email);
+    Encode12str(email, req->email.const_data());

     sprintf(str, "<email value=\"%s\"/>", email.c_str());
     strcat(r, str);
     }
 
     sprintf(str, "<email value=\"%s\"/>", email.c_str());
     strcat(r, str);
     }
 

-if (!req->phone.res_empty())
+if (!req->phone.empty())

     {
     string phone;
     {
     string phone;

-    Encode12str(phone, req->phone);
+    Encode12str(phone, req->phone.const_data());

     sprintf(str, "<phone value=\"%s\"/>", phone.c_str());
     strcat(r, str);
     }
 
     sprintf(str, "<phone value=\"%s\"/>", phone.c_str());
     strcat(r, str);
     }
 

-if (!req->group.res_empty())
+if (!req->group.empty())

     {
     string group;
     {
     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++)
     {
     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;
         {
         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);
         }
         sprintf(str, "<userdata%d value=\"%s\"/>", i, ud.c_str());
         strcat(r, str);
         }


@@ -604,27 +617,27 @@ int CheckParameters(REQUEST * req)
 int u = false;
 int d = false;
 int ud = false;
 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;
 
     || !req->createUser
     || !req->deleteUser;


@@ -632,7 +645,7 @@ int b = !req->cash.res_empty()
 
 for (int i = 0; i < DIR_NUM; i++)
     {
 
 for (int i = 0; i < DIR_NUM; i++)
     {

-    if (req->u[i].res_empty())
+    if (req->u[i].empty())

         {
         u = true;
         break;
         {
         u = true;
         break;


@@ -641,7 +654,7 @@ for (int i = 0; i < DIR_NUM; i++)
 
 for (int i = 0; i < DIR_NUM; i++)
     {
 
 for (int i = 0; i < DIR_NUM; i++)
     {

-    if (req->d[i].res_empty())
+    if (req->d[i].empty())

         {
         d = true;
         break;
         {
         d = true;
         break;


@@ -650,42 +663,29 @@ for (int i = 0; i < DIR_NUM; i++)
 
 for (int i = 0; i < DIR_NUM; i++)
     {
 
 for (int i = 0; i < DIR_NUM; i++)
     {

-    if (req->ud[i].res_empty())
+    if (req->ud[i].empty())

         {
         ud = true;
         break;
         }
     }
 
         {
         ud = true;
         break;
         }
     }
 

-
-//printf("a=%d, b=%d, u=%d, d=%d ud=%d\n", a, b, u, d, ud);

 return a && (b || u || d || ud);
 }
 //-----------------------------------------------------------------------------
 return a && (b || u || d || ud);
 }
 //-----------------------------------------------------------------------------

-int CheckParametersGet(REQUEST * req)
-{
-return CheckParameters(req);
-}
-//-----------------------------------------------------------------------------
-int CheckParametersSet(REQUEST * req)
-{
-return CheckParameters(req);
-}
-//-----------------------------------------------------------------------------

 int mainGet(int argc, char **argv)
 {
 int mainGet(int argc, char **argv)
 {

-int c;

 REQUEST req;
 RESETABLE<string>   t1;
 int missedOptionArg = false;
 
 REQUEST req;
 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)
     {
     option_index = -1;
 int option_index = -1;
 
 while (1)
     {
     option_index = -1;

-    c = getopt_long(argc, argv, short_options_get, long_options_get, &option_index);
+    int c = getopt_long(argc, argv, short_options_get, long_options_get, &option_index);

     if (c == -1)
         break;
 
     if (c == -1)
         break;
 


@@ -697,7 +697,6 @@ while (1)
 
         case 'p': //port
             req.port = ParseServerPort(optarg);
 
         case 'p': //port
             req.port = ParseServerPort(optarg);

-            //req.portReq = 1;

             break;
 
         case 'a': //admin
             break;
 
         case 'a': //admin


@@ -724,6 +723,10 @@ while (1)
             req.credit = 1;
             break;
 
             req.credit = 1;
             break;
 

+        case 'E': //credit expire
+            req.creditExpire = 1;
+            break;
+

         case 'd': //down
             req.down = 1;
             break;
         case 'd': //down
             req.down = 1;
             break;


@@ -763,10 +766,10 @@ while (1)
         case 'G': //Group
             req.group = " ";
             break;
         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 = " ";
 
         case 'S': //Detail stat status
             req.disableDetailStat = " ";


@@ -786,7 +789,6 @@ while (1)
         case 507:
         case 508:
         case 509:
         case 507:
         case 508:
         case 509:

-            //printf("U%d\n", c - 500);

             req.u[c - 500] = 1;
             break;
 
             req.u[c - 500] = 1;
             break;
 


@@ -800,7 +802,6 @@ while (1)
         case 607:
         case 608:
         case 609:
         case 607:
         case 608:
         case 609:

-            //printf("D%d\n", c - 600);

             req.d[c - 600] = 1;
             break;
 
             req.d[c - 600] = 1;
             break;
 


@@ -814,13 +815,15 @@ while (1)
         case 707:
         case 708:
         case 709:
         case 707:
         case 708:
         case 709:

-            //printf("UD%d\n", c - 700);

             req.ud[c - 700] = " ";
             break;
 
             req.ud[c - 700] = " ";
             break;
 

+        case 800:
+            req.authBy = true;
+            break;
+

         case '?':
         case ':':
         case '?':
         case ':':

-            //printf ("Unknown option \n");

             missedOptionArg = true;
             break;
 
             missedOptionArg = true;
             break;
 


@@ -838,27 +841,28 @@ if (optind < argc)
     exit(PARAMETER_PARSING_ERR_CODE);
     }
 
     exit(PARAMETER_PARSING_ERR_CODE);
     }
 

-if (missedOptionArg || !CheckParametersGet(&req))
+if (missedOptionArg || !CheckParameters(&req))

     {
     {

-    //printf("Parameter needed\n");

     UsageInfo();
     exit(PARAMETER_PARSING_ERR_CODE);
     }
 
     UsageInfo();
     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)
 {
 string str;
 
 }
 //-----------------------------------------------------------------------------
 int mainSet(int argc, char **argv)
 {
 string str;
 

-int c;

 bool isMessage = false;
 REQUEST req;
 
 RESETABLE<string>   t1;
 
 bool isMessage = false;
 REQUEST req;
 
 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;
 
 
 int missedOptionArg = false;
 


@@ -866,7 +870,7 @@ while (1)
     {
     int option_index = -1;
 
     {
     int option_index = -1;
 

-    c = getopt_long(argc, argv, short_options_set, long_options_set, &option_index);
+    int c = getopt_long(argc, argv, short_options_set, long_options_set, &option_index);

 
     if (c == -1)
         break;
 
     if (c == -1)
         break;


@@ -879,7 +883,6 @@ while (1)
 
         case 'p': //port
             req.port = ParseServerPort(optarg);
 
         case 'p': //port
             req.port = ParseServerPort(optarg);

-            //req.portReq = 1;

             break;
 
         case 'a': //admin
             break;
 
         case 'a': //admin


@@ -910,6 +913,10 @@ while (1)
             req.credit = ParseCredit(optarg);
             break;
 
             req.credit = ParseCredit(optarg);
             break;
 

+        case 'E': //credit expire
+            req.creditExpire = ParseCreditExpire(optarg);
+            break;
+

         case 'd': //down
             req.down = ParseDownPassive(optarg);
             break;
         case 'd': //down
             req.down = ParseDownPassive(optarg);
             break;


@@ -941,33 +948,32 @@ while (1)
             break;
 
         case 'N': //Note
             break;
 
         case 'N': //Note

-            ParseAnyString(optarg, &str);
+            ParseAnyString(optarg, &str, "koi8-ru");

             req.note = str;
             break;
 
         case 'A': //nAme
             req.note = str;
             break;
 
         case 'A': //nAme

-            ParseAnyString(optarg, &str, "koi8-r");
+            ParseAnyString(optarg, &str, "koi8-ru");

             req.name = str;
             break;
 
         case 'D': //aDdress
             req.name = str;
             break;
 
         case 'D': //aDdress

-            ParseAnyString(optarg, &str);
+            ParseAnyString(optarg, &str, "koi8-ru");

             req.address = str;
             break;
 
         case 'L': //emaiL
             req.address = str;
             break;
 
         case 'L': //emaiL

-            ParseAnyString(optarg, &str);
+            ParseAnyString(optarg, &str, "koi8-ru");

             req.email = str;
             req.email = str;

-            //printf("EMAIL=%s\n", optarg);

             break;
 
         case 'P': //phone
             break;
 
         case 'P': //phone

-            ParseAnyString(optarg, &str);
+            ParseAnyString(optarg, &str, "koi8-ru");

             req.phone = str;
             break;
 
         case 'G': //Group
             req.phone = str;
             break;
 
         case 'G': //Group

-            ParseAnyString(optarg, &str);
+            ParseAnyString(optarg, &str, "koi8-ru");

             req.group = str;
             break;
 
             req.group = str;
             break;
 


@@ -994,7 +1000,6 @@ while (1)
         case 507:
         case 508:
         case 509:
         case 507:
         case 508:
         case 509:

-            //printf("U%d\n", c - 500);

             req.u[c - 500] = ParseTraff(optarg);
             break;
 
             req.u[c - 500] = ParseTraff(optarg);
             break;
 


@@ -1008,7 +1013,6 @@ while (1)
         case 607:
         case 608:
         case 609:
         case 607:
         case 608:
         case 609:

-            //printf("D%d\n", c - 600);

             req.d[c - 600] = ParseTraff(optarg);
             break;
 
             req.d[c - 600] = ParseTraff(optarg);
             break;
 


@@ -1022,18 +1026,15 @@ while (1)
         case 707:
         case 708:
         case 709:
         case 707:
         case 708:
         case 709:

-            ParseAnyString(optarg, &str);
-            //printf("UD%d\n", c - 700);
+            ParseAnyString(optarg, &str, "koi8-ru");

             req.ud[c - 700] = str;
             break;
 
         case '?':
             req.ud[c - 700] = str;
             break;
 
         case '?':

-            //printf("Missing option argument\n");

             missedOptionArg = true;
             break;
 
         case ':':
             missedOptionArg = true;
             break;
 
         case ':':

-            //printf("Missing option argument\n");

             missedOptionArg = true;
             break;
 
             missedOptionArg = true;
             break;
 


@@ -1051,9 +1052,8 @@ if (optind < argc)
     exit(PARAMETER_PARSING_ERR_CODE);
     }
 
     exit(PARAMETER_PARSING_ERR_CODE);
     }
 

-if (missedOptionArg || !CheckParametersSet(&req))
+if (missedOptionArg || !CheckParameters(&req))

     {
     {

-    //printf("Parameter needed\n");

     UsageConf();
     exit(PARAMETER_PARSING_ERR_CODE);
     }
     UsageConf();
     exit(PARAMETER_PARSING_ERR_CODE);
     }


@@ -1063,7 +1063,7 @@ char rstr[rLen];
 memset(rstr, 0, rLen);
 
 CreateRequestSet(&req, rstr);
 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)
 }
 //-----------------------------------------------------------------------------
 int main(int argc, char **argv)


@@ -1076,7 +1076,6 @@ if (argc <= 2)
 
 if (strcmp(argv[1], "get") == 0)
     {
 
 if (strcmp(argv[1], "get") == 0)
     {

-    //printf("get\n");

     return mainGet(argc - 1, argv + 1);
     }
 else if (strcmp(argv[1], "set") == 0)
     return mainGet(argc - 1, argv + 1);
     }
 else if (strcmp(argv[1], "set") == 0)