Ticket 37. The stgTime argument added in TariffChangeIsAllowed()

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / configproto.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index d9f87eca5884786abaffca61a9c5ef621cdb05b8..567c537ae7f6a5aaef04ef641ff1ff77da829db6 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -19,6 +19,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

+#include "configproto.h"

 
 #include "conn.h"
 
 
 #include "conn.h"
 


@@ -27,7 +28,6 @@
 #include "parser_tariffs.h"
 #include "parser_users.h"
 #include "parser_message.h"
 #include "parser_tariffs.h"
 #include "parser_users.h"
 #include "parser_message.h"

-#include "parser_user_info.h"

 #include "parser_auth_by.h"
 
 #include "stg/common.h"
 #include "parser_auth_by.h"
 
 #include "stg/common.h"


@@ -53,6 +53,7 @@ CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l)
       m_admins(NULL),
       m_tariffs(NULL),
       m_users(NULL),
       m_admins(NULL),
       m_tariffs(NULL),
       m_users(NULL),

+      m_store(NULL),

       m_port(0),
       m_bindAddress("0.0.0.0"),
       m_running(false),
       m_port(0),
       m_bindAddress("0.0.0.0"),
       m_running(false),


@@ -158,10 +159,7 @@ void CONFIGPROTO::Run()
         if (!m_running)
             break;
         if (res > 0)
         if (!m_running)
             break;
         if (res > 0)

-        {
-            printfd(__FILE__, "Something happend - received %d events.\n", res);

             HandleEvents(fds);
             HandleEvents(fds);

-        }

 
         CleanupConns();
     }
 
         CleanupConns();
     }


@@ -232,8 +230,6 @@ void CONFIGPROTO::RegisterParsers()
     SP::SEND_MESSAGE::FACTORY::Register(m_registry, *m_users);
 
     SP::AUTH_BY::FACTORY::Register(m_registry, *m_users);
     SP::SEND_MESSAGE::FACTORY::Register(m_registry, *m_users);
 
     SP::AUTH_BY::FACTORY::Register(m_registry, *m_users);

-
-    SP::USER_INFO::FACTORY::Register(m_registry, *m_users);

 }
 
 int CONFIGPROTO::MaxFD() const
 }
 
 int CONFIGPROTO::MaxFD() const


@@ -248,7 +244,6 @@ int CONFIGPROTO::MaxFD() const
 
 void CONFIGPROTO::BuildFDSet(fd_set & fds) const
 {
 
 void CONFIGPROTO::BuildFDSet(fd_set & fds) const
 {

-    printfd(__FILE__, "Building fd set for %d connections.\n", m_conns.size());

     FD_ZERO(&fds);
     FD_SET(m_listenSocket, &fds);
     std::deque<STG::Conn *>::const_iterator it;
     FD_ZERO(&fds);
     FD_SET(m_listenSocket, &fds);
     std::deque<STG::Conn *>::const_iterator it;


@@ -258,8 +253,6 @@ void CONFIGPROTO::BuildFDSet(fd_set & fds) const
 
 void CONFIGPROTO::CleanupConns()
 {
 
 void CONFIGPROTO::CleanupConns()
 {

-    size_t old = m_conns.size();
-

     std::deque<STG::Conn *>::iterator pos;
     for (pos = m_conns.begin(); pos != m_conns.end(); ++pos)
         if (((*pos)->IsDone() && !(*pos)->IsKeepAlive()) || !(*pos)->IsOk())
     std::deque<STG::Conn *>::iterator pos;
     for (pos = m_conns.begin(); pos != m_conns.end(); ++pos)
         if (((*pos)->IsDone() && !(*pos)->IsKeepAlive()) || !(*pos)->IsOk())


@@ -270,9 +263,6 @@ void CONFIGPROTO::CleanupConns()
 
     pos = std::remove(m_conns.begin(), m_conns.end(), static_cast<STG::Conn *>(NULL));
     m_conns.erase(pos, m_conns.end());
 
     pos = std::remove(m_conns.begin(), m_conns.end(), static_cast<STG::Conn *>(NULL));
     m_conns.erase(pos, m_conns.end());

-
-    if (m_conns.size() < old)
-        printfd(__FILE__, "Cleaned up %d connections.\n", old - m_conns.size());

 }
 
 void CONFIGPROTO::HandleEvents(const fd_set & fds)
 }
 
 void CONFIGPROTO::HandleEvents(const fd_set & fds)


@@ -284,17 +274,12 @@ void CONFIGPROTO::HandleEvents(const fd_set & fds)
         std::deque<STG::Conn *>::iterator it;
         for (it = m_conns.begin(); it != m_conns.end(); ++it)
             if (FD_ISSET((*it)->Sock(), &fds))
         std::deque<STG::Conn *>::iterator it;
         for (it = m_conns.begin(); it != m_conns.end(); ++it)
             if (FD_ISSET((*it)->Sock(), &fds))

-            {
-                printfd(__FILE__, "Reading data from %s:%d.\n", inet_ntostring((*it)->IP()).c_str(), (*it)->Port());

                 (*it)->Read();
                 (*it)->Read();

-            }

     }
 }
 
 void CONFIGPROTO::AcceptConnection()
 {
     }
 }
 
 void CONFIGPROTO::AcceptConnection()
 {

-    printfd(__FILE__, "Accepting new connection.\n");
-

     struct sockaddr_in outerAddr;
     socklen_t outerAddrLen(sizeof(outerAddr));
     int sock = accept(m_listenSocket, reinterpret_cast<sockaddr *>(&outerAddr), &outerAddrLen);
     struct sockaddr_in outerAddr;
     socklen_t outerAddrLen(sizeof(outerAddr));
     int sock = accept(m_listenSocket, reinterpret_cast<sockaddr *>(&outerAddr), &outerAddrLen);


@@ -311,7 +296,7 @@ void CONFIGPROTO::AcceptConnection()
 
     try
     {
 
     try
     {

-        m_conns.push_back(new STG::Conn(m_registry, *m_admins, sock, outerAddr));
+        m_conns.push_back(new STG::Conn(m_registry, *m_admins, sock, outerAddr, m_logger));

         printfd(__FILE__, "New connection from %s:%d. Total connections: %d\n", inet_ntostring(m_conns.back()->IP()).c_str(), m_conns.back()->Port(), m_conns.size());
     }
     catch (const STG::Conn::Error & error)
         printfd(__FILE__, "New connection from %s:%d. Total connections: %d\n", inet_ntostring(m_conns.back()->IP()).c_str(), m_conns.back()->Port(), m_conns.size());
     }
     catch (const STG::Conn::Error & error)


@@ -320,9 +305,3 @@ void CONFIGPROTO::AcceptConnection()
         m_logger(std::string("Failed to create new client connection: '") + error.what() + "'.");
     }
 }
         m_logger(std::string("Failed to create new client connection: '") + error.what() + "'.");
     }
 }

-/*
-void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)
-{
-    m_logger("Admin's connection failed. IP %s", inet_ntostring(ip).c_str());
-}
-*/