Minor changes for Darwin.

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

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index afd70b607c93f1e90ad4ba98240f09db74cec8d9..d530108b95e7f225b42e32ce544662559aba6ac3 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -80,7 +80,7 @@ USER_IMPL::USER_IMPL(const SETTINGS * s,
            const USERS * u,
            const SERVICES & svcs)
     : users(u),
            const USERS * u,
            const SERVICES & svcs)
     : users(u),

-      property(s->GetScriptsDir()),
+      property(*s),

       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       id(0),
       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       id(0),


@@ -134,6 +134,8 @@ 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),

+      sessionUploadModTime(stgTime),
+      sessionDownloadModTime(stgTime),

       passiveNotifier(this),
       disabledNotifier(this),
       tariffNotifier(this),
       passiveNotifier(this),
       disabledNotifier(this),
       tariffNotifier(this),


@@ -150,7 +152,7 @@ USER_IMPL::USER_IMPL(const SETTINGS_IMPL * s,
                      const USERS * u,
                      const SERVICES & svcs)
     : users(u),
                      const USERS * u,
                      const SERVICES & svcs)
     : users(u),

-      property(s->GetScriptsDir()),
+      property(*s),

       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       id(0),
       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       id(0),


@@ -204,6 +206,8 @@ 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),

+      sessionUploadModTime(stgTime),
+      sessionDownloadModTime(stgTime),

       passiveNotifier(this),
       disabledNotifier(this),
       tariffNotifier(this),
       passiveNotifier(this),
       disabledNotifier(this),
       tariffNotifier(this),


@@ -218,6 +222,7 @@ void USER_IMPL::Init()
 {
 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;
 {
 password = "*_EMPTY_PASSWORD_*";
 tariffName = NO_TARIFF_NAME;

+tariff = tariffs->FindByName(tariffName);

 ips = StrToIPS("*");
 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
 lastWriteDetailedStat = stgTime;
 ips = StrToIPS("*");
 lastWriteStat = stgTime + random() % settings->GetStatWritePeriod();
 lastWriteDetailedStat = stgTime;


@@ -237,7 +242,7 @@ pthread_mutex_init(&mutex, &attr);
 USER_IMPL::USER_IMPL(const USER_IMPL & u)
     : USER(),
       users(u.users),
 USER_IMPL::USER_IMPL(const USER_IMPL & u)
     : USER(),
       users(u.users),

-      property(u.settings->GetScriptsDir()),
+      property(*u.settings),

       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       login(u.login),
       WriteServLog(GetStgLogger()),
       lastScanMessages(0),
       login(u.login),


@@ -298,6 +303,8 @@ USER_IMPL::USER_IMPL(const USER_IMPL & u)
       userdata9(property.userdata9),
       sessionUpload(),
       sessionDownload(),
       userdata9(property.userdata9),
       sessionUpload(),
       sessionDownload(),

+      sessionUploadModTime(stgTime),
+      sessionDownloadModTime(stgTime),

       passiveNotifier(this),
       disabledNotifier(this),
       tariffNotifier(this),
       passiveNotifier(this),
       disabledNotifier(this),
       tariffNotifier(this),


@@ -621,7 +628,7 @@ if (!fakeConnect)
     connected = true;
     }
 
     connected = true;
     }
 

-if (store->WriteUserConnect(login, currIP))
+if (!settings->GetDisableSessionLog() && store->WriteUserConnect(login, currIP))

     {
     WriteServLog("Cannot write connect for user %s.", login.c_str());
     WriteServLog("%s", store->GetStrError().c_str());
     {
     WriteServLog("Cannot write connect for user %s.", login.c_str());
     WriteServLog("%s", store->GetStrError().c_str());


@@ -685,8 +692,8 @@ std::string reasonMessage(reason);
 if (!lastDisconnectReason.empty())
     reasonMessage += ": " + lastDisconnectReason;
 
 if (!lastDisconnectReason.empty())
     reasonMessage += ": " + lastDisconnectReason;
 

-if (store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload,
-                               cash, freeMb, reasonMessage))
+if (!settings->GetDisableSessionLog() && store->WriteUserDisconnect(login, up, down, sessionUpload, sessionDownload,
+                                                                    cash, freeMb, reasonMessage))

     {
     WriteServLog("Cannot write disconnect for user %s.", login.c_str());
     WriteServLog("%s", store->GetStrError().c_str());
     {
     WriteServLog("Cannot write disconnect for user %s.", login.c_str());
     WriteServLog("%s", store->GetStrError().c_str());


@@ -1178,48 +1185,22 @@ if (nextTariff.ConstData() != "")
     {
     const TARIFF * nt = tariffs->FindByName(nextTariff);
     if (nt == NULL)
     {
     const TARIFF * nt = tariffs->FindByName(nextTariff);
     if (nt == NULL)

+        {

         WriteServLog("Cannot change tariff for user %s. Tariff %s not exist.",
                      login.c_str(), property.tariffName.Get().c_str());
         WriteServLog("Cannot change tariff for user %s. Tariff %s not exist.",
                      login.c_str(), property.tariffName.Get().c_str());

+        }

     else
         {
     else
         {

-        switch (tariff->GetChangePolicy())
+        std::string message = tariff->TariffChangeIsAllowed(*nt, stgTime);
+        if (message.empty())

             {
             {

-            case TARIFF::ALLOW:
-                {
-                property.tariffName.Set(nextTariff, sysAdmin, login, store);
-                break;
-                }
-            case TARIFF::TO_CHEAP:
-                {
-                if (nt->GetFee() < tariff->GetFee())
-                    property.tariffName.Set(nextTariff, sysAdmin, login, store);
-                else
-                    WriteServLog("Tariff change is prohibited for user %s due to the policy %s. Current tariff %s is more cheap than new tariff %s.",
-                                 login.c_str(),
-                                 TARIFF::ChangePolicyToString(tariff->GetChangePolicy()).c_str(),
-                                 property.tariffName.Get().c_str(),
-                                 property.nextTariff.Get().c_str());
-                break;
-                }
-            case TARIFF::TO_EXPENSIVE:
-                {
-                if (nt->GetFee() > tariff->GetFee())
-                    property.tariffName.Set(nextTariff, sysAdmin, login, store);
-                else
-                    WriteServLog("Tariff change is prohibited for user %s due to the policy %s. Current tariff %s is more expensive than new tariff %s.",
-                                 login.c_str(),
-                                 TARIFF::ChangePolicyToString(tariff->GetChangePolicy()).c_str(),
-                                 property.tariffName.Get().c_str(),
-                                 property.nextTariff.Get().c_str());
-                break;
-                }
-            case TARIFF::DENY:
-                {
-                WriteServLog("Tariff change is prohibited for user %s. Tariff %s.",
-                             login.c_str(),
-                             property.tariffName.Get().c_str());
-                break;
-                }
+            property.tariffName.Set(nextTariff, sysAdmin, login, store);
+            }
+        else
+            {
+            WriteServLog("Tariff change is prohibited for user %s. %s",
+                         login.c_str(),
+                         message.c_str());

             }
         }
     ResetNextTariff();
             }
         }
     ResetNextTariff();


@@ -1534,13 +1515,18 @@ else if (!oldValue && newValue && user->IsInetable())
 //-----------------------------------------------------------------------------
 void CHG_TARIFF_NOTIFIER::Notify(const std::string &, const std::string & newTariff)
 {
 //-----------------------------------------------------------------------------
 void CHG_TARIFF_NOTIFIER::Notify(const std::string &, const std::string & newTariff)
 {

+STG_LOCKER lock(&user->mutex);

 if (user->settings->GetReconnectOnTariffChange() && user->connected)
     user->Disconnect(false, "Change tariff");
 user->tariff = user->tariffs->FindByName(newTariff);
 if (user->settings->GetReconnectOnTariffChange() &&
     !user->authorizedBy.empty() &&
     user->IsInetable())
 if (user->settings->GetReconnectOnTariffChange() && user->connected)
     user->Disconnect(false, "Change tariff");
 user->tariff = user->tariffs->FindByName(newTariff);
 if (user->settings->GetReconnectOnTariffChange() &&
     !user->authorizedBy.empty() &&
     user->IsInetable())

+    {
+    // This notifier gets called *before* changing the tariff, and in Connect we want to see new tariff name.
+    user->property.Conf().tariffName = newTariff;

     user->Connect(false);
     user->Connect(false);

+    }

 }
 //-----------------------------------------------------------------------------
 void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash)
 }
 //-----------------------------------------------------------------------------
 void CHG_CASH_NOTIFIER::Notify(const double & oldCash, const double & newCash)