Merge remote-tracking branch 'github/master'

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

diff --git a/projects/stargazer/plugins/other/smux/smux.cpp b/projects/stargazer/plugins/other/smux/smux.cpp
index 07f9d20035d8800c7fcb65f1213e2958fad9d9c3..a6ab83597037d86374b8150da22d1ceb7fc7c953 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.cpp
+++ b/projects/stargazer/plugins/other/smux/smux.cpp
@@ -1,12 +1,7 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
+#include "smux.h"
+#include "utils.h"

 
 

-#include <cstring>
-#include <cerrno>
-#include <ctime>
-#include <csignal>
-#include <cassert>
+#include "stg/common.h"

 
 #include <vector>
 #include <algorithm>
 
 #include <vector>
 #include <algorithm>


@@ -14,10 +9,18 @@
 #include <stdexcept>
 #include <utility>
 
 #include <stdexcept>
 #include <utility>
 

-#include "stg/common.h"
+#include <cstring>
+#include <cerrno>
+#include <ctime>
+#include <csignal>
+#include <cassert>

 
 

-#include "smux.h"
-#include "utils.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+
+using STG::SMUX;
+using STG::SMUX_SETTINGS;

 
 namespace
 {
 
 namespace
 {


@@ -41,9 +44,9 @@ SMUX_SETTINGS::SMUX_SETTINGS()
       port(0)
 {}
 
       port(0)
 {}
 

-int SMUX_SETTINGS::ParseSettings(const STG::ModuleSettings & s)
+int SMUX_SETTINGS::ParseSettings(const ModuleSettings & s)

 {
 {

-STG::ParamValue pv;
+ParamValue pv;

 int p;
 
 pv.param = "Port";
 int p;
 
 pv.param = "Port";


@@ -100,7 +103,7 @@ SMUX::SMUX()
       lastReconnectTry(0),
       reconnectTimeout(1),
       sock(-1),
       lastReconnectTry(0),
       reconnectTimeout(1),
       sock(-1),

-      logger(STG::PluginLogger::get("smux"))
+      logger(PluginLogger::get("smux"))

 {
 smuxHandlers[SMUX_PDUs_PR_close] = &SMUX::CloseHandler;
 smuxHandlers[SMUX_PDUs_PR_registerResponse] = &SMUX::RegisterResponseHandler;
 {
 smuxHandlers[SMUX_PDUs_PR_close] = &SMUX::CloseHandler;
 smuxHandlers[SMUX_PDUs_PR_registerResponse] = &SMUX::RegisterResponseHandler;


@@ -226,7 +229,7 @@ printfd(__FILE__, "SMUX::Stop() - After\n");
 return 0;
 }
 
 return 0;
 }
 

-int SMUX::Reload(const STG::ModuleSettings & /*ms*/)
+int SMUX::Reload(const ModuleSettings & /*ms*/)

 {
 if (Stop() != 0)
     return -1;
 {
 if (Stop() != 0)
     return -1;


@@ -411,23 +414,17 @@ return true;
 
 void SMUX::SetNotifier(UserPtr userPtr)
 {
 
 void SMUX::SetNotifier(UserPtr userPtr)
 {

-notifiers.emplace_back(*this, userPtr);
-userPtr->GetProperties().tariffName.AddAfterNotifier(&notifiers.back());
+    m_conns.emplace_back(
+        userPtr->GetID(),
+        userPtr->GetProperties().tariffName.afterChange([this](const auto&, const auto&){ UpdateTables(); })
+    );

 }
 
 void SMUX::UnsetNotifier(UserPtr userPtr)
 {
 }
 
 void SMUX::UnsetNotifier(UserPtr userPtr)
 {

-auto it = notifiers.begin();
-while (it != notifiers.end())
-    {
-    if (it->GetUserPtr() == userPtr)
-        {
-        userPtr->GetProperties().tariffName.DelAfterNotifier(&(*it));
-        notifiers.erase(it);
-        break;
-        }
-    ++it;
-    }
+    m_conns.erase(std::remove_if(m_conns.begin(), m_conns.end(),
+                                 [userPtr](const auto& c){ return std::get<0>(c) == userPtr->GetID(); }),
+                  m_conns.end());

 }
 
 void SMUX::SetNotifiers()
 }
 
 void SMUX::SetNotifiers()


@@ -450,7 +447,7 @@ m_onDelUserConn = users->onDel([this](auto user){
     UpdateTables();
 });
 
     UpdateTables();
 });
 

-auto updateTables = [this](const STG::TariffData&){ UpdateTables(); };
+auto updateTables = [this](const TariffData&){ UpdateTables(); };

 m_onAddTariffConn = tariffs->onAdd(updateTables);
 m_onDelTariffConn = tariffs->onDel(updateTables);
 }
 m_onAddTariffConn = tariffs->onAdd(updateTables);
 m_onDelTariffConn = tariffs->onDel(updateTables);
 }


@@ -463,11 +460,5 @@ m_onDelTariffConn.disconnect();
 m_onAddUserConn.disconnect();
 m_onDelUserConn.disconnect();
 
 m_onAddUserConn.disconnect();
 m_onDelUserConn.disconnect();
 

-auto it = notifiers.begin();
-while (it != notifiers.end())
-    {
-    it->GetUserPtr()->GetProperties().tariffName.DelAfterNotifier(&(*it));
-    ++it;
-    }
-notifiers.clear();
+m_conns.clear();

 }
 }