Remove extra debug.

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

diff --git a/include/stg/admin_conf.h b/include/stg/admin_conf.h
index 32012f347dcb391c2d14ef9ea55384a848931039..b402e2417c36d4a5f27e331783e93a5e43657096 100644 (file)
--- a/include/stg/admin_conf.h
+++ b/include/stg/admin_conf.h
@@ -1,42 +1,49 @@
- /*
- $Revision: 1.9 $
- $Date: 2010/09/10 05:02:08 $
- $Author: faust $
- */
-
-#ifndef ADMIN_CONF_H
-#define ADMIN_CONF_H
+#pragma once

 
 #include <string>
 
 #include <string>

+#include <optional>

 
 

-#include "os_int.h"
+#include <cstdint>

 
 #define ADM_LOGIN_LEN   (32)
 #define ADM_PASSWD_LEN  (32)
 
 #define ADM_LOGIN_LEN   (32)
 #define ADM_PASSWD_LEN  (32)

-//-----------------------------------------------------------------------------
-struct PRIV
+
+namespace STG
+{
+
+struct Priv

 {
 {

-    PRIV()
-        : userStat(0),
-          userConf(0),
-          userCash(0),
-          userPasswd(0),
-          userAddDel(0),
-          adminChg(0),
-          tariffChg(0)
-    {};
-    PRIV(uint16_t p)
-        : userStat((p & 0x0003) >> 0x00),
-          userConf((p & 0x000C) >> 0x02),
-          userCash((p & 0x0030) >> 0x04),
-          userPasswd((p & 0x00C0) >> 0x06),
-          userAddDel((p & 0x0300) >> 0x08),
-          adminChg((p & 0x0C00) >> 0x0A),
-          tariffChg((p & 0x3000) >> 0x0C)
+    Priv() noexcept : Priv(0) {}
+    explicit Priv(uint32_t p) noexcept
+        : userStat((p & 0x00000003) >> 0x00),
+          userConf((p & 0x0000000C) >> 0x02),
+          userCash((p & 0x00000030) >> 0x04),
+          userPasswd((p & 0x000000C0) >> 0x06),
+          userAddDel((p & 0x00000300) >> 0x08),
+          adminChg((p & 0x00000C00) >> 0x0A),
+          tariffChg((p & 0x00003000) >> 0x0C),
+          serviceChg((p & 0x0000C000) >> 0x0E),
+          corpChg((p & 0x00030000) >> 0x10)

     {}
 
     {}
 

-    uint16_t ToInt() const;
-    void FromInt(uint16_t p);
+    Priv(const Priv&) = default;
+    Priv& operator=(const Priv&) = default;
+    Priv(Priv&&) = default;
+    Priv& operator=(Priv&&) = default;
+
+    uint32_t toInt() const noexcept
+    {
+        uint32_t p = (userStat   << 0)  |
+                     (userConf   << 2)  |
+                     (userCash   << 4)  |
+                     (userPasswd << 6)  |
+                     (userAddDel << 8)  |
+                     (adminChg   << 10) |
+                     (tariffChg  << 12) |
+                     (serviceChg << 14) |
+                     (corpChg    << 16);
+        return p;
+    }

 
     uint16_t userStat;
     uint16_t userConf;
 
     uint16_t userStat;
     uint16_t userConf;


@@ -45,33 +52,34 @@ struct PRIV
     uint16_t userAddDel;
     uint16_t adminChg;
     uint16_t tariffChg;
     uint16_t userAddDel;
     uint16_t adminChg;
     uint16_t tariffChg;

+    uint16_t serviceChg;
+    uint16_t corpChg;

 };
 //-----------------------------------------------------------------------------
 };
 //-----------------------------------------------------------------------------

-struct ADMIN_CONF
+struct AdminConf

 {
 {

-    ADMIN_CONF()
-        : priv(),
-          login(),
-          password("* NO PASSWORD *")
-    {}
-    ADMIN_CONF(const ADMIN_CONF & rvalue)
-        : priv(rvalue.priv),
-          login(rvalue.login),
-          password(rvalue.password)
-    {}
-    ADMIN_CONF(const PRIV & pr, const std::string & l, const std::string & p)
+    AdminConf() : AdminConf({}, {}, "* NO PASSWORD *") {}
+    AdminConf(const Priv& pr, const std::string& l, const std::string& p)

         : priv(pr),
           login(l),
           password(p)
     {}
         : priv(pr),
           login(l),
           password(p)
     {}

-    PRIV          priv;
+
+    AdminConf(const AdminConf&) = default;
+    AdminConf& operator=(const AdminConf&) = default;
+    AdminConf(AdminConf&&) = default;
+    AdminConf& operator=(AdminConf&&) = default;
+
+    Priv          priv;

     std::string   login;
     std::string   password;
 };
 //-----------------------------------------------------------------------------
     std::string   login;
     std::string   password;
 };
 //-----------------------------------------------------------------------------

+struct AdminConfOpt
+{
+    std::optional<Priv> priv;
+    std::optional<std::string> login;
+    std::optional<std::string> password;
+};

 
 

-#include "admin_conf.inc.h"
-
-#endif
-
-
+}