Pretty-printing CTX diff.

[stg.git] / projects / stargazer / users_impl.h

diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h
index 69f3fbae8d9aca286e1aa9d1ae9f3ac0c9cc04c6..bfb52fa17a521ce3832647ba42707a257effbce0 100644 (file)
--- a/projects/stargazer/users_impl.h
+++ b/projects/stargazer/users_impl.h
@@ -18,25 +18,22 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

-/*
-$Revision: 1.31 $
-$Date: 2010/10/07 20:04:48 $
-$Author: faust $
-*/
-
-
-#ifndef USERS_IMPL_H
-#define USERS_IMPL_H
+#pragma once

 
 #include <pthread.h>
 
 
 #include <pthread.h>
 

-#include <ctime>

 #include <string>
 #include <map>
 #include <list>
 #include <set>
 #include <string>
 #include <map>
 #include <list>
 #include <set>

+#include <mutex>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#include <jthread.hpp>
+#pragma GCC diagnostic pop
+#include <ctime>
+#include <cstdint>

 
 

-#include "stg/os_int.h"

 #include "stg/store.h"
 #include "stg/users.h"
 #include "stg/user.h"
 #include "stg/store.h"
 #include "stg/users.h"
 #include "stg/user.h"


@@ -49,12 +46,15 @@ $Author: faust $
 #include "settings_impl.h"
 #include "user_impl.h"
 
 #include "settings_impl.h"
 #include "user_impl.h"
 

+namespace STG
+{
+

 const int userDeleteDelayTime = 120;
 
 const int userDeleteDelayTime = 120;
 

-typedef std::list<USER_IMPL>::iterator user_iter;
-typedef std::list<USER_IMPL>::const_iterator const_user_iter;
+typedef std::list<UserImpl>::iterator user_iter;
+typedef std::list<UserImpl>::const_iterator const_user_iter;

 
 

-class USERS_IMPL;
+class UsersImpl;

 //-----------------------------------------------------------------------------
 struct USER_TO_DEL {
 USER_TO_DEL()
 //-----------------------------------------------------------------------------
 struct USER_TO_DEL {
 USER_TO_DEL()


@@ -62,65 +62,74 @@ USER_TO_DEL()
       delTime(0)
 {}
 
       delTime(0)
 {}
 

-std::list<USER_IMPL>::iterator iter;
+std::list<UserImpl>::iterator iter;

 time_t  delTime;
 };
 //-----------------------------------------------------------------------------
 time_t  delTime;
 };
 //-----------------------------------------------------------------------------

-class USERS_IMPL : private NONCOPYABLE, public USERS {
+class UsersImpl : public Users {

     friend class PROPERTY_NOTIFER_IP_BEFORE;
     friend class PROPERTY_NOTIFER_IP_AFTER;
 
 public:
     friend class PROPERTY_NOTIFER_IP_BEFORE;
     friend class PROPERTY_NOTIFER_IP_AFTER;
 
 public:

-    USERS_IMPL(SETTINGS_IMPL * s, STORE * store, TARIFFS * tariffs, const ADMIN * sysAdmin);
-    virtual ~USERS_IMPL();
+    using UserImplPtr = UserImpl*;

 
 

-    int             FindByName(const std::string & login, USER_PTR * user);
+    UsersImpl(SettingsImpl * s, Store * store,
+              Tariffs * tariffs, Services & svcs,
+              const Admin& sysAdmin);

 
 

-    bool            TariffInUse(const std::string & tariffName) const;
+    int             FindByName(const std::string & login, UserPtr * user) override;
+    int             FindByName(const std::string & login, ConstUserPtr * user) const override;
+    bool            Exists(const std::string & login) const override;

 
 

-    void            AddNotifierUserAdd(NOTIFIER_BASE<USER_PTR> *);
-    void            DelNotifierUserAdd(NOTIFIER_BASE<USER_PTR> *);
+    bool            TariffInUse(const std::string & tariffName) const override;

 
 

-    void            AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> *);
-    void            DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> *);
+    void            AddNotifierUserAdd(NotifierBase<UserPtr> *) override;
+    void            DelNotifierUserAdd(NotifierBase<UserPtr> *) override;

 
 

-    void            AddNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> *);
-    void            DelNotifierUserAdd(NOTIFIER_BASE<USER_IMPL_PTR> *);
+    void            AddNotifierUserDel(NotifierBase<UserPtr> *) override;
+    void            DelNotifierUserDel(NotifierBase<UserPtr> *) override;

 
 

-    void            AddNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> *);
-    void            DelNotifierUserDel(NOTIFIER_BASE<USER_IMPL_PTR> *);
+    void            AddNotifierUserAdd(NotifierBase<UserImplPtr> *);
+    void            DelNotifierUserAdd(NotifierBase<UserImplPtr> *);

 
 

-    int             Add(const std::string & login, const ADMIN * admin);
-    void            Del(const std::string & login, const ADMIN * admin);
+    void            AddNotifierUserDel(NotifierBase<UserImplPtr> *);
+    void            DelNotifierUserDel(NotifierBase<UserImplPtr> *);
+
+    int             Add(const std::string & login, const Admin * admin) override;
+    void            Del(const std::string & login, const Admin * admin) override;

 
     bool            Authorize(const std::string & login, uint32_t ip,
 
     bool            Authorize(const std::string & login, uint32_t ip,

-                              uint32_t enabledDirs, const AUTH * auth);
-    bool            Unauthorize(const std::string & login, const AUTH * auth);
+                              uint32_t enabledDirs, const Auth * auth) override;
+    bool            Unauthorize(const std::string & login,
+                                const Auth * auth,
+                                const std::string & reason) override;

 
 

-    int             ReadUsers();
-    size_t          Count() const { return users.size(); }
+    int             ReadUsers() override;
+    size_t          Count() const override { return users.size(); }

 
 

-    int             FindByIPIdx(uint32_t ip, USER_PTR * user) const;
-    int             FindByIPIdx(uint32_t ip, USER_IMPL ** user) const;
-    bool            IsIPInIndex(uint32_t ip) const;
+    int             FindByIPIdx(uint32_t ip, UserPtr * user) const override;
+    int             FindByIPIdx(uint32_t ip, UserImpl ** user) const;
+    bool            IsIPInIndex(uint32_t ip) const override;
+    bool            IsIPInUse(uint32_t ip, const std::string & login, ConstUserPtr * user) const override;

 
 

-    int             OpenSearch();
-    int             SearchNext(int handler, USER_PTR * user);
-    int             SearchNext(int handler, USER_IMPL ** user);
-    int             CloseSearch(int handler);
+    unsigned int    OpenSearch() override;
+    int             SearchNext(int handler, UserPtr * user) override;
+    int             SearchNext(int handler, UserImpl ** user);
+    int             CloseSearch(int handler) override;

 
 

-    int             Start();
-    int             Stop();
+    int             Start() override;
+    int             Stop() override;

 
 private:
 
 private:

-    USERS_IMPL(const USERS_IMPL & rvalue);
-    USERS_IMPL & operator=(const USERS_IMPL & rvalue);
+    UsersImpl(const UsersImpl & rvalue);
+    UsersImpl & operator=(const UsersImpl & rvalue);

 
     void            AddToIPIdx(user_iter user);
     void            DelFromIPIdx(uint32_t ip);
     bool            FindByIPIdx(uint32_t ip, user_iter & iter) const;
 
 
     void            AddToIPIdx(user_iter user);
     void            DelFromIPIdx(uint32_t ip);
     bool            FindByIPIdx(uint32_t ip, user_iter & iter) const;
 

-    int             FindByNameNonLock(const std::string & login, user_iter * user);
+    bool            FindByNameNonLock(const std::string & login, user_iter * user);
+    bool            FindByNameNonLock(const std::string & login, const_user_iter * user) const;

 
     void            RealDelUser();
     void            ProcessActions();
 
     void            RealDelUser();
     void            ProcessActions();


@@ -128,62 +137,38 @@ private:
     void            AddUserIntoIndexes(user_iter user);
     void            DelUserFromIndexes(user_iter user);
 
     void            AddUserIntoIndexes(user_iter user);
     void            DelUserFromIndexes(user_iter user);
 

-    static void *   Run(void *);
+    void            Run(std::stop_token token);

     void            NewMinute(const struct tm & t);
     void            NewDay(const struct tm & t);
     void            DayResetTraff(const struct tm & t);
 
     bool            TimeToWriteDetailStat(const struct tm & t);
 
     void            NewMinute(const struct tm & t);
     void            NewDay(const struct tm & t);
     void            DayResetTraff(const struct tm & t);
 
     bool            TimeToWriteDetailStat(const struct tm & t);
 

-    std::list<USER_IMPL>                  users;
+    std::list<UserImpl>                  users;

     std::list<USER_TO_DEL>                usersToDelete;
 
     std::map<uint32_t, user_iter>         ipIndex;
     std::map<std::string, user_iter>      loginIndex;
 
     std::list<USER_TO_DEL>                usersToDelete;
 
     std::map<uint32_t, user_iter>         ipIndex;
     std::map<std::string, user_iter>      loginIndex;
 

-    SETTINGS_IMPL *     settings;
-    TARIFFS *           tariffs;
-    STORE *             store;
-    const ADMIN *       sysAdmin;
-    STG_LOGGER &        WriteServLog;
+    SettingsImpl *     settings;
+    Tariffs *           m_tariffs;
+    Services &          m_services;
+    Store *             m_store;
+    const Admin&        m_sysAdmin;
+    Logger &        WriteServLog;

 
 

-    bool                nonstop;

     bool                isRunning;
 
     bool                isRunning;
 

-    mutable pthread_mutex_t mutex;
-    pthread_t               thread;
+    mutable std::mutex      m_mutex;
+    std::jthread            m_thread;

     mutable unsigned int    handle;
 
     mutable unsigned int    handle;
 

-    mutable std::map<int, user_iter>  searchDescriptors;
+    mutable std::map<unsigned int, user_iter>  searchDescriptors;

 
 

-    std::set<NOTIFIER_BASE<USER_PTR>*> onAddNotifiers;
-    std::set<NOTIFIER_BASE<USER_PTR>*> onDelNotifiers;
-    std::set<NOTIFIER_BASE<USER_IMPL_PTR>*> onAddNotifiersImpl;
-    std::set<NOTIFIER_BASE<USER_IMPL_PTR>*> onDelNotifiersImpl;
+    std::set<NotifierBase<UserPtr>*> onAddNotifiers;
+    std::set<NotifierBase<UserPtr>*> onDelNotifiers;
+    std::set<NotifierBase<UserImplPtr>*> onAddNotifiersImpl;
+    std::set<NotifierBase<UserImplPtr>*> onDelNotifiersImpl;

 };
 };

-//-----------------------------------------------------------------------------
-/*inline
-void PROPERTY_NOTIFER_IP_BEFORE::Notify(const uint32_t & oldValue,
-                                        const uint32_t &)
-{
-if (!oldValue)
-    return;

 
 

-//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(users, &USERS::DelFromIPIdx, oldValue);
-// Using explicit call to assure that index is valid, because fast reconnect with delayed call can result in authorization error
-users.DelFromIPIdx(oldValue);

 }
 }

-//-----------------------------------------------------------------------------
-inline
-void PROPERTY_NOTIFER_IP_AFTER::Notify(const uint32_t &,
-                                       const uint32_t & newValue)
-{
-if (!newValue)
-    return;
-
-//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(users, &USERS::AddToIPIdx, user);
-// Using explicit call to assure that index is valid, because fast reconnect with delayed call can result in authorization error
-users.AddToIPIdx(user);
-}*/
-//-----------------------------------------------------------------------------
-#endif