RawPacket-related changes.

[stg.git] / stargazer / plugins / authorization / ao / ao.cpp

diff --git a/stargazer/plugins/authorization/ao/ao.cpp b/stargazer/plugins/authorization/ao/ao.cpp
index d17eeb6dc5ca43131c733608c3a03e364e258ab7..7b6f129d40c7e672a202ab7317a6b33044e796a6 100644 (file)
--- a/stargazer/plugins/authorization/ao/ao.cpp
+++ b/stargazer/plugins/authorization/ao/ao.cpp
@@ -18,36 +18,24 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

-/*
-$Revision: 1.30 $
-$Date: 2010/03/04 12:29:06 $
-$Author: faust $
-*/
-
-#include <unistd.h>
-
-#include <csignal>
-#include <cassert>
-#include <algorithm> // for_each
-#include <functional> // mem_fun_ref
+#include "ao.h"

 
 #include "stg/user.h"
 #include "stg/users.h"
 #include "stg/user_property.h"
 #include "stg/common.h"
 
 #include "stg/user.h"
 #include "stg/users.h"
 #include "stg/user_property.h"
 #include "stg/common.h"

-#include "stg/plugin_creator.h"
-#include "ao.h"

 
 

-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-static PLUGIN_CREATOR<AUTH_AO> aoc;
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-PLUGIN * GetPlugin()
+#include <algorithm> // for_each
+#include <functional> // mem_fun_ref
+#include <csignal>
+#include <cassert>
+
+#include <unistd.h>
+
+extern "C" STG::Plugin* GetPlugin()

 {
 {

-return aoc.GetPlugin();
+    static AUTH_AO plugin;
+    return &plugin;

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------


@@ -62,7 +50,7 @@ AUTH_AO::AUTH_AO()
       isRunning(false),
       onAddUserNotifier(*this),
       onDelUserNotifier(*this),
       isRunning(false),
       onAddUserNotifier(*this),
       onDelUserNotifier(*this),

-      logger(GetPluginLogger(GetStgLogger(), "auth_ao"))
+      logger(STG::PluginLogger::get("auth_ao"))

 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------


@@ -74,7 +62,7 @@ GetUsers();
 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 
 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 

-std::for_each(usersList.begin(), usersList.end(), [this](auto user){ UpdateUserAuthorization(user); });
+std::for_each(userList.begin(), userList.end(), [this](auto user){ UpdateUserAuthorization(user); });

 
 isRunning = true;
 
 
 isRunning = true;
 


@@ -90,20 +78,19 @@ if (!isRunning)
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 
 users->DelNotifierUserAdd(&onAddUserNotifier);
 users->DelNotifierUserDel(&onDelUserNotifier);
 

-std::list<USER_PTR>::iterator users_iter;
-users_iter = usersList.begin();
-while (users_iter != usersList.end())
+auto it = userList.begin();
+while (it != userList.end())

     {
     {

-    if ((*users_iter)->IsAuthorizedBy(this))
-        users->Unauthorize((*users_iter)->GetLogin(), this);
-    UnSetUserNotifiers(*users_iter);
-    ++users_iter;
+    if ((*it)->IsAuthorizedBy(this))
+        users->Unauthorize((*it)->GetLogin(), this);
+    UnSetUserNotifiers(*it);
+    ++it;

     }
 isRunning = false;
 return 0;
 }
 //-----------------------------------------------------------------------------
     }
 isRunning = false;
 return 0;
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::SetUserNotifiers(USER_PTR u)
+void AUTH_AO::SetUserNotifiers(UserPtr u)

 {
 // ---------- AlwaysOnline -------------------
 CHG_BEFORE_NOTIFIER<int> BeforeChgAONotifier(*this, u);
 {
 // ---------- AlwaysOnline -------------------
 CHG_BEFORE_NOTIFIER<int> BeforeChgAONotifier(*this, u);


@@ -112,70 +99,64 @@ CHG_AFTER_NOTIFIER<int>  AfterChgAONotifier(*this, u);
 BeforeChgAONotifierList.push_front(BeforeChgAONotifier);
 AfterChgAONotifierList.push_front(AfterChgAONotifier);
 
 BeforeChgAONotifierList.push_front(BeforeChgAONotifier);
 AfterChgAONotifierList.push_front(AfterChgAONotifier);
 

-u->GetProperty().alwaysOnline.AddBeforeNotifier(&BeforeChgAONotifierList.front());
-u->GetProperty().alwaysOnline.AddAfterNotifier(&AfterChgAONotifierList.front());
+u->GetProperties().alwaysOnline.AddBeforeNotifier(&BeforeChgAONotifierList.front());
+u->GetProperties().alwaysOnline.AddAfterNotifier(&AfterChgAONotifierList.front());

 // ---------- AlwaysOnline end ---------------
 
 // ---------- IP -------------------
 // ---------- AlwaysOnline end ---------------
 
 // ---------- IP -------------------

-CHG_BEFORE_NOTIFIER<USER_IPS> BeforeChgIPNotifier(*this, u);
-CHG_AFTER_NOTIFIER<USER_IPS>  AfterChgIPNotifier(*this, u);
+CHG_BEFORE_NOTIFIER<STG::UserIPs> BeforeChgIPNotifier(*this, u);
+CHG_AFTER_NOTIFIER<STG::UserIPs>  AfterChgIPNotifier(*this, u);

 
 BeforeChgIPNotifierList.push_front(BeforeChgIPNotifier);
 AfterChgIPNotifierList.push_front(AfterChgIPNotifier);
 
 
 BeforeChgIPNotifierList.push_front(BeforeChgIPNotifier);
 AfterChgIPNotifierList.push_front(AfterChgIPNotifier);
 

-u->GetProperty().ips.AddBeforeNotifier(&BeforeChgIPNotifierList.front());
-u->GetProperty().ips.AddAfterNotifier(&AfterChgIPNotifierList.front());
+u->GetProperties().ips.AddBeforeNotifier(&BeforeChgIPNotifierList.front());
+u->GetProperties().ips.AddAfterNotifier(&AfterChgIPNotifierList.front());

 // ---------- IP end ---------------
 }
 //-----------------------------------------------------------------------------
 // ---------- IP end ---------------
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::UnSetUserNotifiers(USER_PTR u)
+void AUTH_AO::UnSetUserNotifiers(UserPtr u)

 {
 // ---      AlwaysOnline        ---
 {
 // ---      AlwaysOnline        ---

-std::list<CHG_BEFORE_NOTIFIER<int> >::iterator aoBIter;
-std::list<CHG_AFTER_NOTIFIER<int> >::iterator  aoAIter;
-
-aoBIter = find_if(BeforeChgAONotifierList.begin(),
-                  BeforeChgAONotifierList.end(),
-                  [u](auto notifier){ return notifier.GetUser() == u; });
+auto aoBIter = find_if(BeforeChgAONotifierList.begin(),
+                       BeforeChgAONotifierList.end(),
+                       [u](auto notifier){ return notifier.GetUser() == u; });

 
 if (aoBIter != BeforeChgAONotifierList.end())
     {
 
 if (aoBIter != BeforeChgAONotifierList.end())
     {

-    aoBIter->GetUser()->GetProperty().alwaysOnline.DelBeforeNotifier(&(*aoBIter));
+    aoBIter->GetUser()->GetProperties().alwaysOnline.DelBeforeNotifier(&(*aoBIter));

     BeforeChgAONotifierList.erase(aoBIter);
     }
 
     BeforeChgAONotifierList.erase(aoBIter);
     }
 

-aoAIter = find_if(AfterChgAONotifierList.begin(),
-                  AfterChgAONotifierList.end(),
-                  [u](auto notifier){ return notifier.GetUser() == u; });
+auto aoAIter = find_if(AfterChgAONotifierList.begin(),
+                       AfterChgAONotifierList.end(),
+                       [u](auto notifier){ return notifier.GetUser() == u; });

 
 if (aoAIter != AfterChgAONotifierList.end())
     {
 
 if (aoAIter != AfterChgAONotifierList.end())
     {

-    aoAIter->GetUser()->GetProperty().alwaysOnline.DelAfterNotifier(&(*aoAIter));
+    aoAIter->GetUser()->GetProperties().alwaysOnline.DelAfterNotifier(&(*aoAIter));

     AfterChgAONotifierList.erase(aoAIter);
     }
 // ---      AlwaysOnline end    ---
 
 // ---          IP              ---
     AfterChgAONotifierList.erase(aoAIter);
     }
 // ---      AlwaysOnline end    ---
 
 // ---          IP              ---

-std::list<CHG_BEFORE_NOTIFIER<USER_IPS> >::iterator ipBIter;
-std::list<CHG_AFTER_NOTIFIER<USER_IPS> >::iterator  ipAIter;
-
-ipBIter = std::find_if(BeforeChgIPNotifierList.begin(),
-                       BeforeChgIPNotifierList.end(),
-                       [u](auto notifier){ return notifier.GetUser() == u; });
+auto ipBIter = std::find_if(BeforeChgIPNotifierList.begin(),
+                            BeforeChgIPNotifierList.end(),
+                            [u](auto notifier){ return notifier.GetUser() == u; });

 
 if (ipBIter != BeforeChgIPNotifierList.end())
     {
 
 if (ipBIter != BeforeChgIPNotifierList.end())
     {

-    ipBIter->GetUser()->GetProperty().ips.DelBeforeNotifier(&(*ipBIter));
+    ipBIter->GetUser()->GetProperties().ips.DelBeforeNotifier(&(*ipBIter));

     BeforeChgIPNotifierList.erase(ipBIter);
     }
 
     BeforeChgIPNotifierList.erase(ipBIter);
     }
 

-ipAIter = find_if(AfterChgIPNotifierList.begin(),
-                  AfterChgIPNotifierList.end(),
-                  [u](auto notifier){ return notifier.GetUser() == u; });
+auto ipAIter = find_if(AfterChgIPNotifierList.begin(),
+                       AfterChgIPNotifierList.end(),
+                       [u](auto notifier){ return notifier.GetUser() == u; });

 
 if (ipAIter != AfterChgIPNotifierList.end())
     {
 
 if (ipAIter != AfterChgIPNotifierList.end())
     {

-    ipAIter->GetUser()->GetProperty().ips.DelAfterNotifier(&(*ipAIter));
+    ipAIter->GetUser()->GetProperties().ips.DelAfterNotifier(&(*ipAIter));

     AfterChgIPNotifierList.erase(ipAIter);
     }
 // ---          IP end          ---
     AfterChgIPNotifierList.erase(ipAIter);
     }
 // ---          IP end          ---


@@ -183,47 +164,47 @@ if (ipAIter != AfterChgIPNotifierList.end())
 //-----------------------------------------------------------------------------
 void AUTH_AO::GetUsers()
 {
 //-----------------------------------------------------------------------------
 void AUTH_AO::GetUsers()
 {

-USER_PTR u;
+UserPtr u;

 int h = users->OpenSearch();
 assert(h && "USERS::OpenSearch is always correct");
 
 while (!users->SearchNext(h, &u))
     {
 int h = users->OpenSearch();
 assert(h && "USERS::OpenSearch is always correct");
 
 while (!users->SearchNext(h, &u))
     {

-    usersList.push_back(u);
+    userList.push_back(u);

     SetUserNotifiers(u);
     }
 
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------
     SetUserNotifiers(u);
     }
 
 users->CloseSearch(h);
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::UpdateUserAuthorization(CONST_USER_PTR u) const
+void AUTH_AO::UpdateUserAuthorization(ConstUserPtr u) const

 {
 {

-if (u->GetProperty().alwaysOnline)
+if (u->GetProperties().alwaysOnline)

     {
     {

-    USER_IPS ips = u->GetProperty().ips;
-    if (ips.OnlyOneIP())
+    auto ips = u->GetProperties().ips.get();
+    if (ips.onlyOneIP())

         {
         users->Authorize(u->GetLogin(), ips[0].ip, 0xFFffFFff, this);
         }
     }
 }
 //-----------------------------------------------------------------------------
         {
         users->Authorize(u->GetLogin(), ips[0].ip, 0xFFffFFff, this);
         }
     }
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::AddUser(USER_PTR u)
+void AUTH_AO::AddUser(UserPtr u)

 {
 SetUserNotifiers(u);
 {
 SetUserNotifiers(u);

-usersList.push_back(u);
+userList.push_back(u);

 UpdateUserAuthorization(u);
 }
 //-----------------------------------------------------------------------------
 UpdateUserAuthorization(u);
 }
 //-----------------------------------------------------------------------------

-void AUTH_AO::DelUser(USER_PTR u)
+void AUTH_AO::DelUser(UserPtr u)

 {
 if (u->IsAuthorizedBy(this))
     users->Unauthorize(u->GetLogin(), this);
 UnSetUserNotifiers(u);
 {
 if (u->IsAuthorizedBy(this))
     users->Unauthorize(u->GetLogin(), this);
 UnSetUserNotifiers(u);

-usersList.remove(u);
+userList.erase(std::remove(userList.begin(), userList.end(), u), userList.end());

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-int AUTH_AO::SendMessage(const STG_MSG &, uint32_t) const
+int AUTH_AO::SendMessage(const STG::Message &, uint32_t) const

 {
 errorStr = "Authorization modele \'AlwaysOnline\' does not support sending messages";
 return -1;
 {
 errorStr = "Authorization modele \'AlwaysOnline\' does not support sending messages";
 return -1;