Copy constructor, assignement operator and network initialization added

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

diff --git a/projects/stargazer/plugins/authorization/ao/ao.cpp b/projects/stargazer/plugins/authorization/ao/ao.cpp
index f1b05dbcaaf93531963f059579d2281885124154..193b20bc2e5ffe3160b6182b4c170541a9ab6caa 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.cpp
+++ b/projects/stargazer/plugins/authorization/ao/ao.cpp
@@ -30,12 +30,11 @@ $Author: faust $
 #include <algorithm> // for_each
 #include <functional> // mem_fun_ref
 
+#include "stg/user.h"
+#include "stg/users.h"
+#include "stg/user_property.h"
+#include "stg/common.h"
 #include "ao.h"
-#include "user.h"
-#include "users.h"
-#include "user_property.h"
-#include "common.h"
-#include "../../../eventloop.h"
 
 class AO_CREATOR
 {
@@ -98,17 +97,12 @@ AUTH_AO::AUTH_AO()
 //-----------------------------------------------------------------------------
 int AUTH_AO::Start()
 {
+printfd(__FILE__, "AUTH_AO::Start()\n");
 GetUsers();
 
 users->AddNotifierUserAdd(&onAddUserNotifier);
 users->AddNotifierUserDel(&onDelUserNotifier);
 
-/*list<USER_PTR>::iterator it = usersList.begin();
-while (it != usersList.end())
-    {
-    UpdateUserAuthorization(*it);
-    ++it;
-    }*/
 std::for_each(usersList.begin(), usersList.end(), std::bind1st(std::mem_fun(&AUTH_AO::UpdateUserAuthorization), this));
 
 isRunning = true;
@@ -118,6 +112,7 @@ return 0;
 //-----------------------------------------------------------------------------
 int AUTH_AO::Stop()
 {
+printfd(__FILE__, "AUTH_AO::Stop()\n");
 if (!isRunning)
     return 0;
 
@@ -145,8 +140,8 @@ CHG_AFTER_NOTIFIER<int>  AfterChgAONotifier(*this, u);
 BeforeChgAONotifierList.push_front(BeforeChgAONotifier);
 AfterChgAONotifierList.push_front(AfterChgAONotifier);
 
-u->GetProperty().alwaysOnline.AddBeforeNotifier(&(*BeforeChgAONotifierList.begin()));
-u->GetProperty().alwaysOnline.AddAfterNotifier(&(*AfterChgAONotifierList.begin()));
+u->GetProperty().alwaysOnline.AddBeforeNotifier(&BeforeChgAONotifierList.front());
+u->GetProperty().alwaysOnline.AddAfterNotifier(&AfterChgAONotifierList.front());
 // ---------- AlwaysOnline end ---------------
 
 // ---------- IP -------------------
@@ -156,8 +151,8 @@ CHG_AFTER_NOTIFIER<USER_IPS>  AfterChgIPNotifier(*this, u);
 BeforeChgIPNotifierList.push_front(BeforeChgIPNotifier);
 AfterChgIPNotifierList.push_front(AfterChgIPNotifier);
 
-u->GetProperty().ips.AddBeforeNotifier(&(*BeforeChgIPNotifierList.begin()));
-u->GetProperty().ips.AddAfterNotifier(&(*AfterChgIPNotifierList.begin()));
+u->GetProperty().ips.AddBeforeNotifier(&BeforeChgIPNotifierList.front());
+u->GetProperty().ips.AddAfterNotifier(&AfterChgIPNotifierList.front());
 // ---------- IP end ---------------
 }
 //-----------------------------------------------------------------------------
@@ -230,7 +225,7 @@ if (!h)
     return;
     }
 
-while (users->SearchNext(h, &u))
+while (!users->SearchNext(h, &u))
     {
     usersList.push_back(u);
     SetUserNotifiers(u);
@@ -270,19 +265,6 @@ void AUTH_AO::DelUser(USER_PTR u)
 Unauthorize(u);
 UnSetUserNotifiers(u);
 usersList.remove(u);
-
-/*list<USER_PTR>::iterator users_iter;
-users_iter = usersList.begin();
-
-while (users_iter != usersList.end())
-    {
-    if (u == *users_iter)
-        {
-        usersList.erase(users_iter);
-        break;
-        }
-    ++users_iter;
-    }*/
 }
 //-----------------------------------------------------------------------------
 int AUTH_AO::SendMessage(const STG_MSG &, uint32_t) const
@@ -294,12 +276,14 @@ return -1;
 template <typename varParamType>
 void CHG_BEFORE_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
 {
-EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);
+//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);
+auth.Unauthorize(user);
 }
 //-----------------------------------------------------------------------------
 template <typename varParamType>
 void CHG_AFTER_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
 {
-EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
+//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);
+auth.UpdateUserAuthorization(user);
 }
 //-----------------------------------------------------------------------------