Locks added, rnd logic for ALIVE changed, CONN_ACK bug fixed

[stg.git] / projects / stargazer / admin_impl.cpp

diff --git a/projects/stargazer/admin_impl.cpp b/projects/stargazer/admin_impl.cpp
index 867717aa83d31bb3430eb37a99f7885cb4d353a3..3d5574c742cf9dbc59e0b1ade6f35a26adb9c55b 100644 (file)
--- a/projects/stargazer/admin_impl.cpp
+++ b/projects/stargazer/admin_impl.cpp
@@ -28,73 +28,75 @@
  $Author: faust $
  */
 
  $Author: faust $
  */
 

-#include "admin.h"
-#include "common.h"
+#include "admin_impl.h"
+#include "stg/common.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-ADMIN::ADMIN()
+ADMIN_IMPL::ADMIN_IMPL()

     : conf(),
       ip(0),
       WriteServLog(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------
     : conf(),
       ip(0),
       WriteServLog(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------

-ADMIN::ADMIN(const ADMIN_CONF & ac)
+ADMIN_IMPL::ADMIN_IMPL(const ADMIN_CONF & ac)

     : conf(ac),
       ip(0),
       WriteServLog(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------
     : conf(ac),
       ip(0),
       WriteServLog(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------

-ADMIN::ADMIN(const PRIV & priv, const std::string & login, const std::string & password)
+ADMIN_IMPL::ADMIN_IMPL(const PRIV & priv,
+                       const std::string & login,
+                       const std::string & password)

     : conf(priv, login, password),
       ip(0),
       WriteServLog(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------
     : conf(priv, login, password),
       ip(0),
       WriteServLog(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------

-ADMIN & ADMIN::operator=(const ADMIN & adm)
+ADMIN & ADMIN_IMPL::operator=(const ADMIN & adm)

 {
 if (&adm == this)
     return *this;
 
 {
 if (&adm == this)
     return *this;
 

-conf = adm.conf;
-ip = adm.ip;
+conf = adm.GetConf();
+ip = adm.GetIP();

 return *this;
 }
 //-----------------------------------------------------------------------------
 return *this;
 }
 //-----------------------------------------------------------------------------

-ADMIN & ADMIN::operator=(const ADMIN_CONF & ac)
+ADMIN & ADMIN_IMPL::operator=(const ADMIN_CONF & ac)

 {
 conf = ac;
 return *this;
 }
 //-----------------------------------------------------------------------------
 {
 conf = ac;
 return *this;
 }
 //-----------------------------------------------------------------------------

-bool ADMIN::operator==(const ADMIN & rhs) const
+bool ADMIN_IMPL::operator==(const ADMIN & rhs) const

 {
 return conf.login == rhs.GetLogin();
 }
 //-----------------------------------------------------------------------------
 {
 return conf.login == rhs.GetLogin();
 }
 //-----------------------------------------------------------------------------

-bool ADMIN::operator!=(const ADMIN & rhs) const
+bool ADMIN_IMPL::operator!=(const ADMIN & rhs) const

 {
 return conf.login != rhs.GetLogin();
 }
 //-----------------------------------------------------------------------------
 {
 return conf.login != rhs.GetLogin();
 }
 //-----------------------------------------------------------------------------

-bool ADMIN::operator<(const ADMIN & rhs) const
+bool ADMIN_IMPL::operator<(const ADMIN & rhs) const

 {
 return conf.login < rhs.GetLogin();
 }
 //-----------------------------------------------------------------------------
 {
 return conf.login < rhs.GetLogin();
 }
 //-----------------------------------------------------------------------------

-bool ADMIN::operator<=(const ADMIN & rhs) const
+bool ADMIN_IMPL::operator<=(const ADMIN & rhs) const

 {
 return conf.login <= rhs.GetLogin();
 }
 //-----------------------------------------------------------------------------
 {
 return conf.login <= rhs.GetLogin();
 }
 //-----------------------------------------------------------------------------

-string ADMIN::GetAdminIPStr() const
+std::string ADMIN_IMPL::GetIPStr() const

 {
 return inet_ntostring(ip);
 }
 //-----------------------------------------------------------------------------
 {
 return inet_ntostring(ip);
 }
 //-----------------------------------------------------------------------------

-void ADMIN::PrintAdmin() const
+void ADMIN_IMPL::Print() const

 {
 printfd(__FILE__, "=======================================\n");
 printfd(__FILE__, "login %s\n",     conf.login.c_str());
 {
 printfd(__FILE__, "=======================================\n");
 printfd(__FILE__, "login %s\n",     conf.login.c_str());


@@ -108,8 +110,8 @@ printfd(__FILE__, "ChgTariff %d\n", conf.priv.tariffChg);
 printfd(__FILE__, "=======================================\n");
 }
 //-----------------------------------------------------------------------------
 printfd(__FILE__, "=======================================\n");
 }
 //-----------------------------------------------------------------------------

-const string ADMIN::GetLogStr() const
+const std::string ADMIN_IMPL::GetLogStr() const

 {
 {

-return "Admin \'" + conf.login + "\', " + GetAdminIPStr() + ":";
+return "Admin \'" + conf.login + "\', " + GetIPStr() + ":";

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