Added missing include.

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

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index ce8af73f7cbae348e8b9411598b1069b1e7324b1..df1cca4ba1136d7e12828e6d6b5ef7d25aada2da 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -32,23 +32,47 @@
 #include <cerrno>
 #include <clocale>
 #include <cstdio>
 #include <cerrno>
 #include <clocale>
 #include <cstdio>

+#include <cstdlib>

 #include <cstring>
 #include <string>
 #include <cstring>
 #include <string>

-#include <list>

 #include <sstream>
 
 #include <sstream>
 

+#include "stg/common.h"

 #include "request.h"
 #include "request.h"

-#include "common.h"
-#include "netunit.h"

 #include "common_sg.h"
 #include "sg_error_codes.h"
 
 #include "common_sg.h"
 #include "sg_error_codes.h"
 

-using namespace std;
+namespace
+{

 
 

-time_t stgTime;
+template <typename T>
+struct ARRAY_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;
+};

 
 

-int ParseReplyGet(void * data, list<string> * ans);
-//int ParseReplySet(void * data, list<string> * ans);
+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;
+}
+
+} // namespace anonymous
+
+time_t stgTime;

 
 struct option long_options_get[] = {
 {"server",      1, 0, 's'},  //Server
 
 struct option long_options_get[] = {
 {"server",      1, 0, 's'},  //Server


@@ -66,37 +90,12 @@ struct option long_options_get[] = {
 {"passive",     0, 0, 'i'},  //passive
 {"disable-stat",0, 0, 'S'},  //disable detail stat
 {"always-online",0, 0, 'O'}, //always online
 {"passive",     0, 0, 'i'},  //passive
 {"disable-stat",0, 0, 'S'},  //disable detail stat
 {"always-online",0, 0, 'O'}, //always online

-{"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
+{"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

 
 {"prepaid",     0, 0, 'e'},  //prepaid traff
 {"create",      0, 0, 'n'},  //create
 
 {"prepaid",     0, 0, 'e'},  //prepaid traff
 {"create",      0, 0, 'n'},  //create


@@ -108,7 +107,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}};
 


@@ -128,37 +128,12 @@ struct option long_options_set[] = {
 {"passive",     1, 0, 'i'},  //passive
 {"disable-stat",1, 0, 'S'},  //disable detail stat
 {"always-online",1, 0, 'O'},  //always online
 {"passive",     1, 0, 'i'},  //passive
 {"disable-stat",1, 0, 'S'},  //disable detail stat
 {"always-online",1, 0, 'O'},  //always online

-{"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
+{"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

 
 {"prepaid",     1, 0, 'e'},  //prepaid traff
 {"create",      1, 0, 'n'},  //create
 
 {"prepaid",     1, 0, 'e'},  //prepaid traff
 {"create",      1, 0, 'n'},  //create


@@ -170,7 +145,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}};
 


@@ -312,6 +287,22 @@ delete[] s;
 return ss;
 }
 //-----------------------------------------------------------------------------
 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;
 void ParseAnyString(const char * c, string * msg, const char * enc)
 {
 iconv_t cd;


@@ -384,10 +375,10 @@ 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.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);
     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);


@@ -413,19 +404,25 @@ if (req->createUser)
 strcat(r, "<SetUser>\n");
 sprintf(str, "<login value=\"%s\"/>\n", req->login.const_data().c_str());
 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);
     }
 
     {
     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;
     Encode12str(msg, req->message);
     {
     string msg;
     Encode12str(msg, req->message);


@@ -433,7 +430,7 @@ if (!req->cash.res_empty())
     strcat(r, str);
     }
 
     strcat(r, str);
     }
 

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

     {
     string msg;
     Encode12str(msg, req->message);
     {
     string msg;
     Encode12str(msg, req->message);


@@ -441,38 +438,38 @@ if (!req->setCash.res_empty())
     strcat(r, 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);


@@ -482,7 +479,36 @@ 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->monthUpload[i].empty())
+        {
+        if (!uPresent && !dPresent)
+            {
+            sprintf(str, "<traff ");
+            strcat(r, str);
+            uPresent = true;
+            }
+
+        stringstream ss;
+        ss << req->monthUpload[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 (!uPresent && !dPresent)
+            {
+            sprintf(str, "<traff ");
+            strcat(r, str);
+            dPresent = true;
+            }
+
+        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)
             {
         {
         if (!uPresent && !dPresent)
             {


@@ -492,12 +518,12 @@ for (int i = 0; i < DIR_NUM; i++)
             }
 
         stringstream ss;
             }
 
         stringstream ss;

-        ss << req->u[i].const_data();
+        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);
         }
         //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->d[i].res_empty())
+    if (!req->sessionDownload[i].empty())

         {
         if (!uPresent && !dPresent)
             {
         {
         if (!uPresent && !dPresent)
             {


@@ -507,7 +533,7 @@ for (int i = 0; i < DIR_NUM; i++)
             }
 
         stringstream ss;
             }
 
         stringstream ss;

-        ss << req->d[i].const_data();
+        ss << req->sessionDownload[i].const_data();

         sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str());
         strcat(r, str);
         }
         sprintf(str, "MD%d=\"%s\" ", i, ss.str().c_str());
         strcat(r, str);
         }


@@ -519,7 +545,7 @@ if (uPresent || dPresent)
 
 //printf("%s\n", r);
 
 
 //printf("%s\n", r);
 

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

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


@@ -539,60 +565,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.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.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.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.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.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.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->userData[i].empty())

         {
         string ud;
         {
         string ud;

-        Encode12str(ud, req->ud[i]);
+        Encode12str(ud, req->userData[i].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);
         }


@@ -603,30 +629,32 @@ strcat(r, "</SetUser>\n");
 //-----------------------------------------------------------------------------
 int CheckParameters(REQUEST * req)
 {
 //-----------------------------------------------------------------------------
 int CheckParameters(REQUEST * req)
 {

-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
+bool su = false;
+bool sd = false;
+bool mu = false;
+bool md = false;
+bool ud = false;
+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;
 
     || !req->createUser
     || !req->deleteUser;


@@ -634,25 +662,43 @@ 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->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())

         {
         {

-        u = true;
+        mu = true;

         break;
         }
     }
 
 for (int i = 0; i < DIR_NUM; i++)
     {
         break;
         }
     }
 
 for (int i = 0; i < DIR_NUM; i++)
     {

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

         {
         {

-        d = true;
+        md = true;

         break;
         }
     }
 
 for (int i = 0; i < DIR_NUM; i++)
     {
         break;
         }
     }
 
 for (int i = 0; i < DIR_NUM; i++)
     {

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

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


@@ -661,7 +707,7 @@ for (int i = 0; i < DIR_NUM; i++)
 
 
 //printf("a=%d, b=%d, u=%d, d=%d ud=%d\n", a, b, u, d, ud);
 
 
 //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 || su || sd || mu || md || ud);

 }
 //-----------------------------------------------------------------------------
 int CheckParametersGet(REQUEST * req)
 }
 //-----------------------------------------------------------------------------
 int CheckParametersGet(REQUEST * req)


@@ -674,14 +720,14 @@ int CheckParametersSet(REQUEST * req)
 return CheckParameters(req);
 }
 //-----------------------------------------------------------------------------
 return CheckParameters(req);
 }
 //-----------------------------------------------------------------------------

-int mainGet(int argc, char **argv)
+bool mainGet(int argc, char **argv)

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


@@ -726,6 +772,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;


@@ -765,10 +815,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 = " ";


@@ -779,50 +829,33 @@ while (1)
             break;
 
         case 500: //U
             break;
 
         case 500: //U

+            SetArrayItem(req.sessionUpload, optarg, 1);
+            //req.sessionUpload[optarg] = 1;
+            break;

         case 501:
         case 501:

+            SetArrayItem(req.sessionDownload, optarg, 1);
+            //req.sessionDownload[optarg] = 1;
+            break;

         case 502:
         case 502:

+            SetArrayItem(req.monthUpload, optarg, 1);
+            //req.monthUpload[optarg] = 1;
+            break;

         case 503:
         case 503:

-        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;
+            SetArrayItem(req.monthDownload, optarg, 1);
+            //req.monthDownload[optarg] = 1;

             break;
 
         case 700: //UserData
             break;
 
         case 700: //UserData

-        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] = " ";
+            SetArrayItem(req.userData, optarg, std::string(" "));
+            //req.userData[optarg] = " ";
+            break;
+
+        case 800:
+            req.authBy = true;

             break;
 
         case '?':
         case ':':
             break;
 
         case '?':
         case ':':

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

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


@@ -847,10 +880,13 @@ if (missedOptionArg || !CheckParametersGet(&req))
     exit(PARAMETER_PARSING_ERR_CODE);
     }
 
     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.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data());
+else
+    return ProcessGetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), req.login.data(), req);

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-int mainSet(int argc, char **argv)
+bool mainSet(int argc, char **argv)

 {
 string str;
 
 {
 string str;
 


@@ -860,7 +896,7 @@ REQUEST req;
 
 RESETABLE<string>   t1;
 
 
 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;
 


@@ -912,6 +948,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;


@@ -943,7 +983,7 @@ while (1)
             break;
 
         case 'N': //Note
             break;
 
         case 'N': //Note

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

             req.note = str;
             break;
 
             req.note = str;
             break;
 


@@ -953,12 +993,12 @@ while (1)
             break;
 
         case 'D': //aDdress
             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;
             //printf("EMAIL=%s\n", optarg);
             break;
             req.email = str;
             //printf("EMAIL=%s\n", optarg);
             break;


@@ -969,7 +1009,7 @@ while (1)
             break;
 
         case 'G': //Group
             break;
 
         case 'G': //Group

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

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


@@ -987,55 +1027,33 @@ while (1)
             break;
 
         case 500: //U
             break;
 
         case 500: //U

+            SetArrayItem(req.sessionUpload, optarg, ParseTraff(argv[optind++]));
+            //req.sessionUpload[optarg] = ParseTraff(argv[optind++]);
+            break;

         case 501:
         case 501:

+            SetArrayItem(req.sessionDownload, optarg, ParseTraff(argv[optind++]));
+            //req.sessionDownload[optarg] = ParseTraff(argv[optind++]);
+            break;

         case 502:
         case 502:

+            SetArrayItem(req.monthUpload, optarg, ParseTraff(argv[optind++]));
+            //req.monthUpload[optarg] = ParseTraff(argv[optind++]);
+            break;

         case 503:
         case 503:

-        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);
+            SetArrayItem(req.monthDownload, optarg, ParseTraff(argv[optind++]));
+            //req.monthDownload[optarg] = ParseTraff(argv[optind++]);

             break;
 
         case 700: //UserData
             break;
 
         case 700: //UserData

-        case 701:
-        case 702:
-        case 703:
-        case 704:
-        case 705:
-        case 706:
-        case 707:
-        case 708:
-        case 709:
-            ParseAnyString(optarg, &str);
-            //printf("UD%d\n", c - 700);
-            req.ud[c - 700] = str;
+            ParseAnyString(argv[optind++], &str);
+            SetArrayItem(req.userData, optarg, str);
+            //req.userData[optarg] = str;

             break;
 
         case '?':
             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;
 


@@ -1065,7 +1083,10 @@ 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);
+if (isMessage)
+    return ProcessSendMessage(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), rstr);
+
+return ProcessSetUser(req.server.data(), req.port.data(), req.admLogin.data(), req.admPasswd.data(), rstr);

 }
 //-----------------------------------------------------------------------------
 int main(int argc, char **argv)
 }
 //-----------------------------------------------------------------------------
 int main(int argc, char **argv)


@@ -1084,7 +1105,9 @@ if (strcmp(argv[1], "get") == 0)
 else if (strcmp(argv[1], "set") == 0)
     {
     //printf("set\n");
 else if (strcmp(argv[1], "set") == 0)
     {
     //printf("set\n");

-    return mainSet(argc - 1, argv + 1);
+    if (mainSet(argc - 1, argv + 1) )
+        return 0;
+    return -1;

     }
 else
     {
     }
 else
     {