Minor ChangeLog fix

[stg.git] / projects / stargazer / user_impl.cpp

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index ec271442bd428f7ebae398e195daad9d098ed99c..733e625692bed34418c0a2dcdbccf0362fbc5571 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -58,10 +58,12 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
       users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
       users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),

+      lastScanMessages(0),

       login(),
       id(0),
       __connected(0),
       connected(__connected),
       login(),
       id(0),
       __connected(0),
       connected(__connected),

+      enabledDirs(),

       userIDGenerator(),
       __currIP(0),
       currIP(__currIP),
       userIDGenerator(),
       __currIP(0),
       currIP(__currIP),


@@ -71,6 +73,14 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
       store(st),
       tariffs(t),
       tariff(NULL),
       store(st),
       tariffs(t),
       tariff(NULL),

+      traffStat(),
+      traffStatSaved(),
+      settings(s),
+      authorizedBy(),
+      messages(),
+      deleted(false),
+      lastWriteStat(0),
+      lastWriteDetailedStat(0),

       cash(property.cash),
       up(property.up),
       down(property.down),
       cash(property.cash),
       up(property.up),
       down(property.down),


@@ -105,18 +115,18 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),

+      sessionUpload(),
+      sessionDownload(),

       passiveNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),
       passiveNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),

-      ipNotifier(this)
+      ipNotifier(this),
+      mutex(),
+      errorStr()

 {
 {

-settings = s;
-

 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;
 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;

-connected = 0;

 ips = StrToIPS("*");
 ips = StrToIPS("*");

-deleted = false;

 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
 lastWriteDetailedStat = stgTime;
 
 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
 lastWriteDetailedStat = stgTime;
 


@@ -125,8 +135,6 @@ property.passive.AddBeforeNotifier(&passiveNotifier);
 property.cash.AddBeforeNotifier(&cashNotifier);
 ips.AddAfterNotifier(&ipNotifier);
 
 property.cash.AddBeforeNotifier(&cashNotifier);
 ips.AddAfterNotifier(&ipNotifier);
 

-lastScanMessages = 0;
-

 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);


@@ -134,18 +142,20 @@ pthread_mutex_init(&mutex, &attr);
 }
 #else
 USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
 }
 #else
 USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,

-           const STORE * st,
-           const TARIFFS * t,
-           const ADMIN * a,
-           const USERS * u)
+                     const STORE * st,
+                     const TARIFFS * t,
+                     const ADMIN * a,
+                     const USERS * u)

     : USER(),
       users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
     : USER(),
       users(u),
       property(s->GetScriptsDir()),
       WriteServLog(GetStgLogger()),

+      lastScanMessages(0),

       login(),
       id(0),
       __connected(0),
       connected(__connected),
       login(),
       id(0),
       __connected(0),
       connected(__connected),

+      enabledDirs(),

       userIDGenerator(),
       __currIP(0),
       currIP(__currIP),
       userIDGenerator(),
       __currIP(0),
       currIP(__currIP),


@@ -155,6 +165,14 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
       store(st),
       tariffs(t),
       tariff(NULL),
       store(st),
       tariffs(t),
       tariff(NULL),

+      traffStat(),
+      traffStatSaved(),
+      settings(s),
+      authorizedBy(),
+      messages(),
+      deleted(false),
+      lastWriteStat(0),
+      lastWriteDetailedStat(0),

       cash(property.cash),
       up(property.up),
       down(property.down),
       cash(property.cash),
       up(property.up),
       down(property.down),


@@ -189,18 +207,18 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),

+      sessionUpload(),
+      sessionDownload(),

       passiveNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),
       passiveNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),

-      ipNotifier(this)
+      ipNotifier(this),
+      mutex(),
+      errorStr()

 {
 {

-settings = s;
-

 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;
 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;

-connected = 0;

 ips = StrToIPS("*");
 ips = StrToIPS("*");

-deleted = false;

 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
 lastWriteDetailedStat = stgTime;
 
 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
 lastWriteDetailedStat = stgTime;
 


@@ -209,8 +227,6 @@ property.passive.AddBeforeNotifier(&passiveNotifier);
 property.cash.AddBeforeNotifier(&cashNotifier);
 ips.AddAfterNotifier(&ipNotifier);
 
 property.cash.AddBeforeNotifier(&cashNotifier);
 ips.AddAfterNotifier(&ipNotifier);
 

-lastScanMessages = 0;
-

 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 pthread_mutexattr_t attr;
 pthread_mutexattr_init(&attr);
 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);


@@ -223,10 +239,13 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       users(u.users),
       property(u.settings->GetScriptsDir()),
       WriteServLog(GetStgLogger()),
       users(u.users),
       property(u.settings->GetScriptsDir()),
       WriteServLog(GetStgLogger()),

+      lastScanMessages(0),

       login(u.login),
       id(u.id),
       login(u.login),
       id(u.id),

-      __connected(u.__connected),
+      __connected(0),

       connected(__connected),
       connected(__connected),

+      enabledDirs(),
+      userIDGenerator(u.userIDGenerator),

       __currIP(u.__currIP),
       currIP(__currIP),
       lastIPForDisconnect(0),
       __currIP(u.__currIP),
       currIP(__currIP),
       lastIPForDisconnect(0),


@@ -235,6 +254,14 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       store(u.store),
       tariffs(u.tariffs),
       tariff(u.tariff),
       store(u.store),
       tariffs(u.tariffs),
       tariff(u.tariff),

+      traffStat(u.traffStat),
+      traffStatSaved(u.traffStatSaved),
+      settings(u.settings),
+      authorizedBy(),
+      messages(u.messages),
+      deleted(u.deleted),
+      lastWriteStat(u.lastWriteStat),
+      lastWriteDetailedStat(u.lastWriteDetailedStat),

       cash(property.cash),
       up(property.up),
       down(property.down),
       cash(property.cash),
       up(property.up),
       down(property.down),


@@ -269,30 +296,23 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),
       userdata7(property.userdata7),
       userdata8(property.userdata8),
       userdata9(property.userdata9),

+      sessionUpload(),
+      sessionDownload(),

       passiveNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),
       passiveNotifier(this),
       tariffNotifier(this),
       cashNotifier(this),

-      ipNotifier(this)
+      ipNotifier(this),
+      mutex(),
+      errorStr()

 {
 if (&u == this)
     return;
 
 {
 if (&u == this)
     return;
 

-connected = 0;
-
-deleted = u.deleted;
-
-lastWriteStat = u.lastWriteStat;
-lastWriteDetailedStat = u.lastWriteDetailedStat;
-
-settings = u.settings;
-

 property.tariffName.AddBeforeNotifier(&tariffNotifier);
 property.passive.AddBeforeNotifier(&passiveNotifier);
 property.cash.AddBeforeNotifier(&cashNotifier);
 ips.AddAfterNotifier(&ipNotifier);
 
 property.tariffName.AddBeforeNotifier(&tariffNotifier);
 property.passive.AddBeforeNotifier(&passiveNotifier);
 property.cash.AddBeforeNotifier(&cashNotifier);
 ips.AddAfterNotifier(&ipNotifier);
 

-lastScanMessages = 0;
-

 property.SetProperties(u.property);
 
 pthread_mutexattr_t attr;
 property.SetProperties(u.property);
 
 pthread_mutexattr_t attr;


@@ -345,6 +365,9 @@ std::vector<STG_MSG_HDR> hdrsList;
 if (store->GetMessageHdrs(&hdrsList, login))
     {
     printfd(__FILE__, "Error GetMessageHdrs %s\n", store->GetStrError().c_str());
 if (store->GetMessageHdrs(&hdrsList, login))
     {
     printfd(__FILE__, "Error GetMessageHdrs %s\n", store->GetStrError().c_str());

+    WriteServLog("Cannot read user %s. Error reading message headers: %s.",
+                 login.c_str(),
+                 store->GetStrError().c_str());

     return -1;
     }
 
     return -1;
     }
 


@@ -461,7 +484,7 @@ for (int i = 0; i < DIR_NUM; i++)
     enabledDirs[i] = dirs & (1 << i);
     }
 
     enabledDirs[i] = dirs & (1 << i);
     }
 

-if (authorizedBy.size())
+if (!authorizedBy.empty())

     {
     if (currIP != ip)
         {
     {
     if (currIP != ip)
         {


@@ -566,7 +589,7 @@ if (!fakeConnect)
                 id,
                 dirsStr);
 
                 id,
                 dirsStr);
 

-        ScriptExec(scriptOnConnectParams);
+        ScriptExec(scriptOnConnectParams.c_str());

         }
     else
         {
         }
     else
         {


@@ -623,7 +646,7 @@ if (!fakeDisconnect)
                 id,
                 dirsStr);
 
                 id,
                 dirsStr);
 

-        ScriptExec(scriptOnDisonnectParams);
+        ScriptExec(scriptOnDisonnectParams.c_str());

         }
     else
         {
         }
     else
         {


@@ -1032,7 +1055,7 @@ if (access(scriptOnAdd.c_str(), X_OK) == 0)
             scriptOnAdd.c_str(),
             login.c_str());
 
             scriptOnAdd.c_str(),
             login.c_str());
 

-    ScriptExec(scriptOnAddParams);
+    ScriptExec(scriptOnAddParams.c_str());

     }
 else
     {
     }
 else
     {


@@ -1054,7 +1077,7 @@ if (access(scriptOnDel.c_str(), X_OK) == 0)
             scriptOnDel.c_str(),
             login.c_str());
 
             scriptOnDel.c_str(),
             login.c_str());
 

-    ScriptExec(scriptOnDelParams);
+    ScriptExec(scriptOnDelParams.c_str());

     }
 else
     {
     }
 else
     {


@@ -1220,11 +1243,11 @@ switch (settings->GetFeeChargeType())
         property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
         break;
     case 1:
         property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
         break;
     case 1:

-        if (c > 0)
+        if (c + credit >= 0)

             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
         break;
     case 2:
             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
         break;
     case 2:

-        if (c > fee)
+        if (c + credit >= fee)

             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
         break;
     }
             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
         break;
     }


@@ -1262,8 +1285,10 @@ if (fee == 0.0)
     }
 
 double c = cash;
     }
 
 double c = cash;

-printfd(__FILE__, "login: %8s   Fee=%f PassiveTimePart=%f fee=%f\n",
+printfd(__FILE__, "login: %8s Cash=%f Credit=%f  Fee=%f PassiveTimePart=%f fee=%f\n",

         login.c_str(),
         login.c_str(),

+        cash.ConstData(),
+        credit.ConstData(),

         tariff->GetFee(),
         passiveTimePart,
         fee);
         tariff->GetFee(),
         passiveTimePart,
         fee);


@@ -1274,14 +1299,14 @@ switch (settings->GetFeeChargeType())
         SetPrepaidTraff();
         break;
     case 1:
         SetPrepaidTraff();
         break;
     case 1:

-        if (c > 0)
+        if (c + credit >= 0)

             {
             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
             SetPrepaidTraff();
             }
         break;
     case 2:
             {
             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
             SetPrepaidTraff();
             }
         break;
     case 2:

-        if (c > fee)
+        if (c + credit >= fee)

             {
             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
             SetPrepaidTraff();
             {
             property.cash.Set(c - fee, sysAdmin, login, store, "Subscriber fee charge");
             SetPrepaidTraff();