More subscriptions, less notifiers.

[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 8d5079bdc331c169db7d436dd70547def1653414..07f9d20035d8800c7fcb65f1213e2958fad9d9c3 100644 (file)
--- a/projects/stargazer/plugins/other/smux/smux.cpp
+++ b/projects/stargazer/plugins/other/smux/smux.cpp
@@ -100,7 +100,6 @@ SMUX::SMUX()
       lastReconnectTry(0),
       reconnectTimeout(1),
       sock(-1),
       lastReconnectTry(0),
       reconnectTimeout(1),
       sock(-1),

-      addDelTariffNotifier(*this),

       logger(STG::PluginLogger::get("smux"))
 {
 smuxHandlers[SMUX_PDUs_PR_close] = &SMUX::CloseHandler;
       logger(STG::PluginLogger::get("smux"))
 {
 smuxHandlers[SMUX_PDUs_PR_close] = &SMUX::CloseHandler;


@@ -442,23 +441,24 @@ while (users->SearchNext(h, &u) == 0)
 
 users->CloseSearch(h);
 
 
 users->CloseSearch(h);
 

-m_onAddUserConn = users->onUserAdd([this](auto user){
+m_onAddUserConn = users->onAdd([this](auto user){

     SetNotifier(user);
     UpdateTables();
 });
     SetNotifier(user);
     UpdateTables();
 });

-m_onDelUserConn = users->onUserDel([this](auto user){
+m_onDelUserConn = users->onDel([this](auto user){

     UnsetNotifier(user);
     UpdateTables();
 });
 
     UnsetNotifier(user);
     UpdateTables();
 });
 

-tariffs->AddNotifierAdd(&addDelTariffNotifier);
-tariffs->AddNotifierDel(&addDelTariffNotifier);
+auto updateTables = [this](const STG::TariffData&){ UpdateTables(); };
+m_onAddTariffConn = tariffs->onAdd(updateTables);
+m_onDelTariffConn = tariffs->onDel(updateTables);

 }
 
 void SMUX::ResetNotifiers()
 {
 }
 
 void SMUX::ResetNotifiers()
 {

-tariffs->DelNotifierDel(&addDelTariffNotifier);
-tariffs->DelNotifierAdd(&addDelTariffNotifier);
+m_onAddTariffConn.disconnect();
+m_onDelTariffConn.disconnect();

 
 m_onAddUserConn.disconnect();
 m_onDelUserConn.disconnect();
 
 m_onAddUserConn.disconnect();
 m_onDelUserConn.disconnect();