From: Maxim Mamontov <faust.madf@gmail.com>
Date: Mon, 4 Apr 2011 18:35:37 +0000 (+0300)
Subject: Obsolete files removed
X-Git-Tag: 2.407-rc3~91
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/ba677f33d7c0da542b67e80dce849b9db74c327e

Obsolete files removed
---

diff --git a/projects/stargazer/plugins/configuration/sgconfig/net_configurator.cpp b/projects/stargazer/plugins/configuration/sgconfig/net_configurator.cpp
deleted file mode 100644
index 6b8bc845..00000000
--- a/projects/stargazer/plugins/configuration/sgconfig/net_configurator.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-#include <unistd.h>
-#include "net_configurator.h"
-#include "../../internal_configurator.h"
-
-//-----------------------------------------------------------------------------
-const string & NET_CONFIGURATOR_SETTINGS::GetStrError()
-{
-return strError;
-}
-//-----------------------------------------------------------------------------
-int NET_CONFIGURATOR_SETTINGS::ReadSettings(const CONFIGFILE &cf)
-{
-if (cf.ReadUShortInt("AdminPort", &port, 5555) != 0)
-    {
-    strError = "Cannot read parameter AdminPort.";
-    return -1;
-    }
-if (port < 1 || port > 65535)
-    {
-    strError = "Incorrect value AdminPort.";
-    return -1;
-    }
-
-string strOrder;
-cf.ReadString("AdminOrder", &strOrder, "allow,deny");
-if (hostAllow.ParseOrder(strOrder.c_str()) < 0)
-    {
-    strError = string("Error in parameter AdminOrder. ") + hostAllow.GetStrError();
-    return -1;
-    }
-
-string strAllow;
-cf.ReadString("AdminAllowFrom", &strAllow, "all");
-if (hostAllow.ParseHosts(strAllow.c_str(), hostsAllow) != 0)
-    {
-    strError = string("Error in parameter AdminAllowFrom. ") + hostAllow.GetStrError();
-    return -1;
-    }
-
-string strDeny;
-cf.ReadString("AdminDenyFrom", &strDeny, "");
-if (hostAllow.ParseHosts(strDeny.c_str(), hostsDeny) != 0)
-    {
-    strError = string("Error in parameter AdminDenyFrom. ") + hostAllow.GetStrError();
-    return -1;
-    }
-return 0;
-}
-//-----------------------------------------------------------------------------
-uint16_t NET_CONFIGURATOR_SETTINGS::GetPort()
-{
-return port;
-}
-//-----------------------------------------------------------------------------
-HOSTALLOW * NET_CONFIGURATOR_SETTINGS::GetHostAllow()
-{
-return &hostAllow;
-}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-NET_CONFIGURATOR::NET_CONFIGURATOR()
-{
-hostAllow = settings.GetHostAllow();
-}
-//-----------------------------------------------------------------------------
-NET_CONFIGURATOR::~NET_CONFIGURATOR()
-{
-
-}
-//-----------------------------------------------------------------------------
-void NET_CONFIGURATOR::SetStgConfigurator(BASE_INT_CONFIGURATOR * bsc)
-{
-stgConfigurator = bsc;
-cp.SetStgConfigurator(stgConfigurator);
-}
-//-----------------------------------------------------------------------------
-int NET_CONFIGURATOR::UserGetAll(string * login, 
-                       USER_CONF_RES * conf,
-                       USER_STAT_RES * stat,
-                       time_t lastUpdate)
-{
-return 0;
-}
-//-----------------------------------------------------------------------------
-int NET_CONFIGURATOR::TatiffGetAll(TARIFF_CONF * conf)
-{
-return 0;
-}
-//-----------------------------------------------------------------------------
-int NET_CONFIGURATOR::AdminGetAll(ADMIN_CONF  * conf)
-{
-return 0;
-}
-//-----------------------------------------------------------------------------
-const string & NET_CONFIGURATOR::GetStrError()
-{
-return strError;
-}
-//-----------------------------------------------------------------------------
-void NET_CONFIGURATOR::Start()
-{
-cp.SetPort(settings.GetPort());
-cp.SetHostAllow(settings.GetHostAllow());
-cp.Start();
-}
-//-----------------------------------------------------------------------------
-void NET_CONFIGURATOR::Stop()
-{
-cp.Stop();
-}
-//-----------------------------------------------------------------------------
-void NET_CONFIGURATOR::Restart()
-{
-cp.Restart();
-}
-//-----------------------------------------------------------------------------
-CONF_STATUS NET_CONFIGURATOR::Status()
-{
-return cp.Status();
-}
-//-----------------------------------------------------------------------------
-BASE_SETTINGS * NET_CONFIGURATOR::GetConfiguratorSettings()
-{
-return &settings;
-}
-//-----------------------------------------------------------------------------
-void NET_CONFIGURATOR::SetAdmins(const ADMINS * a)
-{
-cp.SetAdmins(a);
-}
-//-----------------------------------------------------------------------------
-
diff --git a/projects/stargazer/plugins/configuration/sgconfig/net_configurator.h b/projects/stargazer/plugins/configuration/sgconfig/net_configurator.h
deleted file mode 100644
index ec1348f0..00000000
--- a/projects/stargazer/plugins/configuration/sgconfig/net_configurator.h
+++ /dev/null
@@ -1,65 +0,0 @@
- /*
- $Revision: 1.2 $
- $Date: 2005/10/30 21:34:28 $
- */
-
-#ifndef NET_CONFIGURATOR_H
-#define NET_CONFIGURATOR_H
-
-#include <time.h>
-#include <string>
-
-#include "../../base_ext_configurator.h"
-#include "../../base_int_configurator.h"
-#include "../../base_settings.h"
-#include "hostallow.h"
-#include "conffiles.h"
-#include "configproto.h"
-
-using namespace std;
-//-----------------------------------------------------------------------------
-class NET_CONFIGURATOR_SETTINGS: public BASE_SETTINGS
-{
-public:
-    virtual ~NET_CONFIGURATOR_SETTINGS(){};
-virtual const string & GetStrError();
-    virtual int ReadSettings(const CONFIGFILE & cf);
-    uint16_t    GetPort();
-    HOSTALLOW * GetHostAllow();
-
-private:
-    string strError;
-    uint16_t port;
-    HOSTALLOW hostAllow;
-};
-//-----------------------------------------------------------------------------
-class NET_CONFIGURATOR: public BASE_EXT_CONFIGURATOR
-{
-public:
-    NET_CONFIGURATOR();
-    virtual ~NET_CONFIGURATOR();
-    virtual void SetStgConfigurator(BASE_INT_CONFIGURATOR *);
-    virtual int UserGetAll(string * login, 
-                           USER_CONF_RES * conf,
-                           USER_STAT_RES * stat,
-                           time_t lastUpdate);
-    virtual int TatiffGetAll(TARIFF_CONF * conf);
-    virtual int AdminGetAll(ADMIN_CONF  * conf);
-    virtual const string & GetStrError();
-    virtual void Start();
-    virtual void Stop();
-    virtual void Restart();
-    virtual CONF_STATUS Status();
-    virtual BASE_SETTINGS * GetConfiguratorSettings();
-    virtual void SetAdmins(const ADMINS * a);
-
-private:
-    HOSTALLOW * hostAllow;
-    BASE_INT_CONFIGURATOR * stgConfigurator;
-    NET_CONFIGURATOR_SETTINGS settings;
-    string strError;
-    CONFIGPROTO cp;
-};
-//-----------------------------------------------------------------------------
-#endif //NET_CONFIGURATOR_H
-