Cosmetic changes and possible sgconfig hang's fix

[stg.git] / projects / stargazer / plugins / other / rscript / rscript.cpp

diff --git a/projects/stargazer/plugins/other/rscript/rscript.cpp b/projects/stargazer/plugins/other/rscript/rscript.cpp
index 3b00b3f8ec7b00f341f668eddb8c09fba27e8771..b4bbb1a0b40e177a1aca6c688cbeed2d4fd37a61 100644 (file)
--- a/projects/stargazer/plugins/other/rscript/rscript.cpp
+++ b/projects/stargazer/plugins/other/rscript/rscript.cpp
@@ -29,10 +29,14 @@
 
 #include <csignal>
 #include <cassert>
+#include <cstdlib>
 #include <algorithm>
 
+#include "stg/common.h"
+#include "stg/locker.h"
+#include "stg/user_property.h"
+#include "stg/plugin_creator.h"
 #include "rscript.h"
-#include "common.h"
 #include "ur_functor.h"
 #include "send_functor.h"
 
@@ -43,34 +47,11 @@ extern volatile const time_t stgTime;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-class RS_CREATOR
-{
-private:
-    REMOTE_SCRIPT * rs;
-
-public:
-    RS_CREATOR()
-        : rs(new REMOTE_SCRIPT())
-        {
-        };
-    ~RS_CREATOR()
-        {
-        delete rs;
-        };
-
-    REMOTE_SCRIPT * GetPlugin()
-        {
-        return rs;
-        };
-};
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+PLUGIN_CREATOR<REMOTE_SCRIPT> rsc;
 //-----------------------------------------------------------------------------
-RS_CREATOR rsc;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-BASE_PLUGIN * GetPlugin()
+PLUGIN * GetPlugin()
 {
 return rsc.GetPlugin();
 }
@@ -79,11 +60,12 @@ return rsc.GetPlugin();
 //-----------------------------------------------------------------------------
 RS_USER::RS_USER()
     : lastSentTime(0),
+      user(NULL),
       shortPacketsCount(0)
 {
 }
 //-----------------------------------------------------------------------------
-RS_USER::RS_USER(const std::vector<uint32_t> & r, user_iter it)
+RS_USER::RS_USER(const std::vector<uint32_t> & r, USER_PTR it)
     : lastSentTime(0),
       user(it),
       routers(r),
@@ -97,21 +79,6 @@ RS_SETTINGS::RS_SETTINGS()
 {
 }
 //-----------------------------------------------------------------------------
-int RS_SETTINGS::ParseIntInRange(const string & str, int min, int max, int * val)
-{
-if (str2x(str.c_str(), *val))
-    {
-    errorStr = "Incorrect value \'" + str + "\'.";
-    return -1;
-    }
-if (*val < min || *val > max)
-    {
-    errorStr = "Value \'" + str + "\' out of range.";
-    return -1;
-    }
-return 0;
-}
-//-----------------------------------------------------------------------------
 int RS_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 int p;
@@ -209,7 +176,9 @@ REMOTE_SCRIPT::REMOTE_SCRIPT()
       nonstop(false),
       isRunning(false),
       users(NULL),
-      sock(0)
+      sock(0),
+      onAddUserNotifier(*this),
+      onDelUserNotifier(*this)
 {
 pthread_mutex_init(&mutex, NULL);
 }
@@ -253,8 +222,8 @@ netRouters = rsSettings.GetSubnetsMap();
 
 InitEncrypt(&ctx, rsSettings.GetPassword());
 
-onAddUserNotifier.SetRemoteScript(this);
-onDelUserNotifier.SetRemoteScript(this);
+//onAddUserNotifier.SetRemoteScript(this);
+//onDelUserNotifier.SetRemoteScript(this);
 
 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
@@ -497,7 +466,7 @@ return (res != sizeof(buffer));
 //-----------------------------------------------------------------------------
 bool REMOTE_SCRIPT::GetUsers()
 {
-user_iter u;
+USER_PTR u;
 
 int h = users->OpenSearch();
 if (!h)
@@ -516,7 +485,7 @@ users->CloseSearch(h);
 return false;
 }
 //-----------------------------------------------------------------------------
-void REMOTE_SCRIPT::ChangedIP(user_iter u, uint32_t oldIP, uint32_t newIP)
+void REMOTE_SCRIPT::ChangedIP(USER_PTR u, uint32_t oldIP, uint32_t newIP)
 {
 /*
  * When ip changes process looks like:
@@ -558,78 +527,78 @@ for (size_t i = 0; i < netRouters.size(); ++i)
 return std::vector<uint32_t>();
 }
 //-----------------------------------------------------------------------------
-string REMOTE_SCRIPT::GetUserParam(user_iter u, const string & paramName) const
+string REMOTE_SCRIPT::GetUserParam(USER_PTR u, const string & paramName) const
 {
 string value = "";
 if (strcasecmp(paramName.c_str(), "cash") == 0)
-    strprintf(&value, "%f", u->property.cash.Get());
+    strprintf(&value, "%f", u->GetProperty().cash.Get());
 else
 if (strcasecmp(paramName.c_str(), "freeMb") == 0)
-    strprintf(&value, "%f", u->property.freeMb.Get());
+    strprintf(&value, "%f", u->GetProperty().freeMb.Get());
 else
 if (strcasecmp(paramName.c_str(), "passive") == 0)
-    strprintf(&value, "%d", u->property.passive.Get());
+    strprintf(&value, "%d", u->GetProperty().passive.Get());
 else
 if (strcasecmp(paramName.c_str(), "disabled") == 0)
-    strprintf(&value, "%d", u->property.disabled.Get());
+    strprintf(&value, "%d", u->GetProperty().disabled.Get());
 else
 if (strcasecmp(paramName.c_str(), "alwaysOnline") == 0)
-    strprintf(&value, "%d", u->property.alwaysOnline.Get());
+    strprintf(&value, "%d", u->GetProperty().alwaysOnline.Get());
 else
 if (strcasecmp(paramName.c_str(), "tariffName") == 0 ||
     strcasecmp(paramName.c_str(), "tariff") == 0)
-    value = "\"" + u->property.tariffName.Get() + "\"";
+    value = "\"" + u->GetProperty().tariffName.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "nextTariff") == 0)
-    value = "\"" + u->property.nextTariff.Get() + "\"";
+    value = "\"" + u->GetProperty().nextTariff.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "address") == 0)
-    value = "\"" + u->property.address.Get() + "\"";
+    value = "\"" + u->GetProperty().address.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "note") == 0)
-    value = "\"" + u->property.note.Get() + "\"";
+    value = "\"" + u->GetProperty().note.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "group") == 0)
-    value = "\"" + u->property.group.Get() + "\"";
+    value = "\"" + u->GetProperty().group.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "email") == 0)
-    value = "\"" + u->property.email.Get() + "\"";
+    value = "\"" + u->GetProperty().email.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "realName") == 0)
-    value = "\"" + u->property.realName.Get() + "\"";
+    value = "\"" + u->GetProperty().realName.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "credit") == 0)
-    strprintf(&value, "%f", u->property.credit.Get());
+    strprintf(&value, "%f", u->GetProperty().credit.Get());
 else
 if (strcasecmp(paramName.c_str(), "userdata0") == 0)
-    value = "\"" + u->property.userdata0.Get() + "\"";
+    value = "\"" + u->GetProperty().userdata0.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "userdata1") == 0)
-    value = "\"" + u->property.userdata1.Get() + "\"";
+    value = "\"" + u->GetProperty().userdata1.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "userdata2") == 0)
-    value = "\"" + u->property.userdata2.Get() + "\"";
+    value = "\"" + u->GetProperty().userdata2.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "userdata3") == 0)
-    value = "\"" + u->property.userdata3.Get() + "\"";
+    value = "\"" + u->GetProperty().userdata3.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "userdata4") == 0)
-    value = "\"" + u->property.userdata4.Get() + "\"";
+    value = "\"" + u->GetProperty().userdata4.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "userdata5") == 0)
-    value = "\"" + u->property.userdata5.Get() + "\"";
+    value = "\"" + u->GetProperty().userdata5.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "userdata6") == 0)
-    value = "\"" + u->property.userdata6.Get() + "\"";
+    value = "\"" + u->GetProperty().userdata6.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "userdata7") == 0)
-    value = "\"" + u->property.userdata7.Get() + "\"";
+    value = "\"" + u->GetProperty().userdata7.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "userdata8") == 0)
-    value = "\"" + u->property.userdata8.Get() + "\"";
+    value = "\"" + u->GetProperty().userdata8.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "userdata9") == 0)
-    value = "\"" + u->property.userdata9.Get() + "\"";
+    value = "\"" + u->GetProperty().userdata9.Get() + "\"";
 else
 if (strcasecmp(paramName.c_str(), "enabledDirs") == 0)
     value = u->GetEnabledDirs();
@@ -638,23 +607,21 @@ else
 return value;
 }
 //-----------------------------------------------------------------------------
-void REMOTE_SCRIPT::SetUserNotifier(user_iter u)
+void REMOTE_SCRIPT::SetUserNotifier(USER_PTR u)
 {
-RS_CHG_AFTER_NOTIFIER<uint32_t>  AfterChgIPNotifier;
+RS_CHG_AFTER_NOTIFIER<uint32_t> afterChgIPNotifier(*this, u);
 
-AfterChgIPNotifier.SetRemoteScript(this);
-AfterChgIPNotifier.SetUser(u);
-AfterChgIPNotifierList.push_front(AfterChgIPNotifier);
+afterChgIPNotifierList.push_front(afterChgIPNotifier);
 
-u->AddCurrIPAfterNotifier(&(*AfterChgIPNotifierList.begin()));
+u->AddCurrIPAfterNotifier(&(*afterChgIPNotifierList.begin()));
 }
 //-----------------------------------------------------------------------------
-void REMOTE_SCRIPT::UnSetUserNotifier(user_iter u)
+void REMOTE_SCRIPT::UnSetUserNotifier(USER_PTR u)
 {
 list<RS_CHG_AFTER_NOTIFIER<uint32_t> >::iterator  ipAIter;
 std::list<list<RS_CHG_AFTER_NOTIFIER<uint32_t> >::iterator> toErase;
 
-for (ipAIter = AfterChgIPNotifierList.begin(); ipAIter != AfterChgIPNotifierList.end(); ++ipAIter)
+for (ipAIter = afterChgIPNotifierList.begin(); ipAIter != afterChgIPNotifierList.end(); ++ipAIter)
     {
     if (ipAIter->GetUser() == u)
         {
@@ -667,14 +634,14 @@ std::list<list<RS_CHG_AFTER_NOTIFIER<uint32_t> >::iterator>::iterator eIter;
 
 for (eIter = toErase.begin(); eIter != toErase.end(); ++eIter)
     {
-    AfterChgIPNotifierList.erase(*eIter);
+    afterChgIPNotifierList.erase(*eIter);
     }
 }
 //-----------------------------------------------------------------------------
 template <typename varParamType>
 void RS_CHG_AFTER_NOTIFIER<varParamType>::Notify(const varParamType & oldValue, const varParamType & newValue)
 {
-rs->ChangedIP(user, oldValue, newValue);
+rs.ChangedIP(user, oldValue, newValue);
 }
 //-----------------------------------------------------------------------------
 void REMOTE_SCRIPT::InitEncrypt(BLOWFISH_CTX * ctx, const string & password) const