Merge branch 'stg-2.409' into stg-2.409-radius

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

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.h b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
index 6e296836ac8d27730a2b1610fd9ce7564abccacc..f80735754c6bb951e97258eb27c9b50729488a0d 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h
@@ -28,7 +28,7 @@
 #include "stg/os_int.h"
 
 #include <string>
 #include "stg/os_int.h"
 
 #include <string>

-#include <vector>
+#include <deque>

 
 #include <sys/select.h>
 #include <sys/types.h>
 
 #include <sys/select.h>
 #include <sys/types.h>


@@ -50,10 +50,11 @@ class Conn;
 
 class CONFIGPROTO {
 public:
 
 class CONFIGPROTO {
 public:

-    CONFIGPROTO(PLUGIN_LOGGER & l);
+    explicit CONFIGPROTO(PLUGIN_LOGGER & l);

     ~CONFIGPROTO();
 
     void            SetPort(uint16_t port) { m_port = port; }
     ~CONFIGPROTO();
 
     void            SetPort(uint16_t port) { m_port = port; }

+    void            SetBindAddress(const std::string & address) { m_bindAddress = address; }

     void            SetSettings(const SETTINGS * settings) { m_settings = settings; }
     void            SetAdmins(ADMINS * admins) { m_admins = admins; }
     void            SetTariffs(TARIFFS * tariffs) { m_tariffs = tariffs; }
     void            SetSettings(const SETTINGS * settings) { m_settings = settings; }
     void            SetAdmins(ADMINS * admins) { m_admins = admins; }
     void            SetTariffs(TARIFFS * tariffs) { m_tariffs = tariffs; }


@@ -76,6 +77,7 @@ private:
     STORE *          m_store;
 
     uint16_t         m_port;
     STORE *          m_store;
 
     uint16_t         m_port;

+    std::string      m_bindAddress;

     bool             m_running;
     bool             m_stopped;
     PLUGIN_LOGGER &  m_logger;
     bool             m_running;
     bool             m_stopped;
     PLUGIN_LOGGER &  m_logger;


@@ -84,7 +86,9 @@ private:
     std::string      m_errorStr;
 
     BASE_PARSER::REGISTRY m_registry;
     std::string      m_errorStr;
 
     BASE_PARSER::REGISTRY m_registry;

-    std::vector<STG::Conn *> m_conns;
+    std::deque<STG::Conn *> m_conns;
+
+    bool Bind();

 
     void RegisterParsers();
 
 
     void RegisterParsers();