Fix some BSD-related issues.

[stg.git] / include / stg / users.h

diff --git a/include/stg/users.h b/include/stg/users.h
index a1d5d295ced2f91adaac53ac95589e5c5c1ad42f..04b156056e0dab9baf35fa329c3d6554aab53fd2 100644 (file)
--- a/include/stg/users.h
+++ b/include/stg/users.h
@@ -18,51 +18,59 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#ifndef USERS_H
-#define USERS_H
+#pragma once
+
+#include "notifer.h"

 
 #include <string>
 
 
 #include <string>
 

-#include "notifer.h"
-#include "user.h"
+namespace STG
+{

 
 

-class ADMIN;
+struct Admin;
+struct User;
+struct Auth;

 
 

-class USERS {
-public:
-    virtual ~USERS() {}
-    virtual int  FindByName(const std::string & login, USER_PTR * user) = 0;
-    virtual int  FindByName(const std::string & login, CONST_USER_PTR * user) const = 0;
+struct Users {
+    virtual ~Users() = default;

 
 

-    virtual bool TariffInUse(const std::string & tariffName) const = 0;
+    using UserPtr = User*;
+    using ConstUserPtr = const User*;

 
 

-    virtual void AddNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * notifier) = 0;
-    virtual void DelNotifierUserAdd(NOTIFIER_BASE<USER_PTR> * notifier) = 0;
+    virtual int  FindByName(const std::string& login, UserPtr* user) = 0;
+    virtual int  FindByName(const std::string& login, ConstUserPtr* user) const = 0;
+    virtual bool Exists(const std::string& login) const = 0;

 
 

-    virtual void AddNotifierUserDel(NOTIFIER_BASE<USER_PTR> * notifier) = 0;
-    virtual void DelNotifierUserDel(NOTIFIER_BASE<USER_PTR> * notifier) = 0;
+    virtual bool TariffInUse(const std::string& tariffName) const = 0;

 
 

-    virtual int  Add(const std::string & login, const ADMIN * admin) = 0;
-    virtual void Del(const std::string & login, const ADMIN * admin) = 0;
+    virtual void AddNotifierUserAdd(NotifierBase<User*>* notifier) = 0;
+    virtual void DelNotifierUserAdd(NotifierBase<User*>* notifier) = 0;

 
 

-    virtual bool Authorize(const std::string & login, uint32_t ip,
-                           uint32_t enabledDirs, const AUTH * auth) = 0;
-    virtual bool Unauthorize(const std::string & login, const AUTH * auth) = 0;
+    virtual void AddNotifierUserDel(NotifierBase<User*>* notifier) = 0;
+    virtual void DelNotifierUserDel(NotifierBase<User*>* notifier) = 0;
+
+    virtual int  Add(const std::string& login, const Admin* admin) = 0;
+    virtual void Del(const std::string& login, const Admin* admin) = 0;
+
+    virtual bool Authorize(const std::string& login, uint32_t ip,
+                           uint32_t enabledDirs, const Auth* auth) = 0;
+    virtual bool Unauthorize(const std::string& login,
+                             const Auth* auth,
+                             const std::string& reason = {}) = 0;

 
     virtual int  ReadUsers() = 0;
     virtual size_t Count() const = 0;
 
 
     virtual int  ReadUsers() = 0;
     virtual size_t Count() const = 0;
 

-    virtual int  FindByIPIdx(uint32_t ip, USER_PTR * user) const = 0;
+    virtual int  FindByIPIdx(uint32_t ip, User** user) const = 0;

     virtual bool IsIPInIndex(uint32_t ip) const = 0;
     virtual bool IsIPInIndex(uint32_t ip) const = 0;

-    virtual bool IsIPInUse(uint32_t ip, const std::string & login, CONST_USER_PTR * user) const = 0;
+    virtual bool IsIPInUse(uint32_t ip, const std::string & login, const User** user) const = 0;

 
     virtual int  OpenSearch() = 0;
 
     virtual int  OpenSearch() = 0;

-    virtual int  SearchNext(int handle, USER_PTR * u) = 0;
+    virtual int  SearchNext(int handle, User** u) = 0;

     virtual int  CloseSearch(int handle) = 0;
 
     virtual int  Start() = 0;
     virtual int  Stop() = 0;
     virtual int  CloseSearch(int handle) = 0;
 
     virtual int  Start() = 0;
     virtual int  Stop() = 0;

-

 };
 
 };
 

-#endif
+}