From 25dd1ac0696ca47e586e58d4309fc4c36e11d1dc Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Wed, 12 Dec 2012 21:39:19 +0200 Subject: [PATCH] Removed GTS string. --- Makefile | 2 +- include/acl.h | 8 ++++---- include/datatypes.h | 6 +++--- include/logger.h | 8 ++++---- include/oids.h | 4 ++-- include/pidfile.h | 6 +++--- include/settings.h | 6 +++--- include/settings.inl.h | 6 +++--- include/snmptable.h | 6 +++--- include/snmptable.inl.h | 6 +++--- include/subscriber.h | 6 +++--- include/switch.h | 6 +++--- include/syncer.h | 6 +++--- include/version.h.in | 6 +++--- src/acl.cpp | 4 ++-- src/dataparser.cpp | 8 ++++---- src/logger.cpp | 2 +- src/main.cpp | 12 ++++++------ src/pidfile.cpp | 2 +- src/settings.cpp | 4 ++-- src/settingsfileparser.cpp | 2 +- src/snmptable.cpp | 2 +- src/subscriber.cpp | 2 +- src/switch.cpp | 4 ++-- src/syncer.cpp | 10 +++++----- gssmd.conf => ssmd.conf | 10 +++++----- tests/test_data_parser.cpp | 6 +++--- tests/test_switch.cpp | 8 ++++---- 28 files changed, 79 insertions(+), 79 deletions(-) rename gssmd.conf => ssmd.conf (67%) diff --git a/Makefile b/Makefile index 94f1574..1d3630f 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ LIBS = -lpthread \ -lboost_system \ -lboost_program_options \ 3rdparty/snmp++/libsnmp++.a -PROG = gssmd # GTS SNMP Switch Management Daemon +PROG = ssmd # SNMP Switch Management Daemon VERSION = 1.1.2 SOURCES = src/main.cpp \ diff --git a/include/acl.h b/include/acl.h index f275446..cee7cb3 100644 --- a/include/acl.h +++ b/include/acl.h @@ -1,12 +1,12 @@ -#ifndef __GTS_ACL_H__ -#define __GTS_ACL_H__ +#ifndef __SSMD_ACL_H__ +#define __SSMD_ACL_H__ #include #include class Pdu; -namespace GTS { +namespace SSMD { class ACL { public: @@ -48,7 +48,7 @@ class ACL { friend std::ostream & operator<<(std::ostream & stream, const ACL & acl); }; -std::ostream & operator<<(std::ostream & stream, const GTS::ACL & acl); +std::ostream & operator<<(std::ostream & stream, const SSMD::ACL & acl); } diff --git a/include/datatypes.h b/include/datatypes.h index 28983df..723e20d 100644 --- a/include/datatypes.h +++ b/include/datatypes.h @@ -1,10 +1,10 @@ -#ifndef __GTS_DATA_TYPES_H__ -#define __GTS_DATA_TYPES_H__ +#ifndef __SSMD_DATA_TYPES_H__ +#define __SSMD_DATA_TYPES_H__ #include #include -namespace GTS { +namespace SSMD { struct LineType { std::string switchIP; diff --git a/include/logger.h b/include/logger.h index 35d3e46..7207003 100644 --- a/include/logger.h +++ b/include/logger.h @@ -1,5 +1,5 @@ -#ifndef __GTS_LOGGER_H__ -#define __GTS_LOGGER_H__ +#ifndef __SSMD_LOGGER_H__ +#define __SSMD_LOGGER_H__ #include #include @@ -7,7 +7,7 @@ #define LOG_IT logger << __FILE__ << "(" << __LINE__ << ") : " -namespace GTS { +namespace SSMD { class Logger { public: @@ -36,6 +36,6 @@ private: } -extern GTS::Logger logger; +extern SSMD::Logger logger; #endif diff --git a/include/oids.h b/include/oids.h index 5f11291..7526b1f 100644 --- a/include/oids.h +++ b/include/oids.h @@ -1,5 +1,5 @@ -#ifndef __GTS_OIDS_H__ -#define __GTS_OIDS_H__ +#ifndef __SSMD_OIDS_H__ +#define __SSMD_OIDS_H__ #define swACLEtherRuleProfileID ".1.3.6.1.4.1.171.12.9.2.10.1.1.1" #define swACLEtherRuleAccessID ".1.3.6.1.4.1.171.12.9.3.10.1.1.2" diff --git a/include/pidfile.h b/include/pidfile.h index d2422bd..ba9adec 100644 --- a/include/pidfile.h +++ b/include/pidfile.h @@ -1,11 +1,11 @@ -#ifndef __GTS_PIDFILE_H__ -#define __GTS_PIDFILE_H__ +#ifndef __SSMD_PIDFILE_H__ +#define __SSMD_PIDFILE_H__ #include #include -namespace GTS { +namespace SSMD { class PIDFile : private boost::noncopyable { public: diff --git a/include/settings.h b/include/settings.h index e384a42..c88f94a 100644 --- a/include/settings.h +++ b/include/settings.h @@ -1,5 +1,5 @@ -#ifndef __GTS_SETTINGS_H__ -#define __GTS_SETTINGS_H__ +#ifndef __SSMD_SETTINGS_H__ +#define __SSMD_SETTINGS_H__ #include @@ -8,7 +8,7 @@ namespace po = boost::program_options; -namespace GTS { +namespace SSMD { class SettingsParser; class Settings { diff --git a/include/settings.inl.h b/include/settings.inl.h index 1c771ce..dbc275c 100644 --- a/include/settings.inl.h +++ b/include/settings.inl.h @@ -1,10 +1,10 @@ -#ifndef __GTS_SETTINGS_INL_H__ -#define __GTS_SETTINGS_INL_H__ +#ifndef __SSMD_SETTINGS_INL_H__ +#define __SSMD_SETTINGS_INL_H__ #include #include -namespace GTS { +namespace SSMD { inline Settings::Settings() diff --git a/include/snmptable.h b/include/snmptable.h index 81efb56..0175a2f 100644 --- a/include/snmptable.h +++ b/include/snmptable.h @@ -1,11 +1,11 @@ -#ifndef __GTS_SNMPTABLE_H__ -#define __GTS_SNMPTABLE_H__ +#ifndef __SSMD_SNMPTABLE_H__ +#define __SSMD_SNMPTABLE_H__ #include #include "snmp_pp/snmp_pp.h" -namespace GTS { +namespace SSMD { typedef std::list SNMPList; diff --git a/include/snmptable.inl.h b/include/snmptable.inl.h index 63ff217..b113af6 100644 --- a/include/snmptable.inl.h +++ b/include/snmptable.inl.h @@ -1,7 +1,7 @@ -#ifndef __GTS_SNMPTABLE_INL_H__ -#define __GTS_SNMPTABLE_INL_H__ +#ifndef __SSMD_SNMPTABLE_INL_H__ +#define __SSMD_SNMPTABLE_INL_H__ -namespace GTS { +namespace SSMD { template inline diff --git a/include/subscriber.h b/include/subscriber.h index 44d6db3..11bf1c2 100644 --- a/include/subscriber.h +++ b/include/subscriber.h @@ -1,9 +1,9 @@ -#ifndef __GTS_SUBSCRIBER_H__ -#define __GTS_SUBSCRIBER_H__ +#ifndef __SSMD_SUBSCRIBER_H__ +#define __SSMD_SUBSCRIBER_H__ #include -namespace GTS { +namespace SSMD { class Subscriber { public: diff --git a/include/switch.h b/include/switch.h index bf585c5..bd99652 100644 --- a/include/switch.h +++ b/include/switch.h @@ -1,5 +1,5 @@ -#ifndef __GTS_SWITCH_H__ -#define __GTS_SWITCH_H__ +#ifndef __SSMD_SWITCH_H__ +#define __SSMD_SWITCH_H__ #include #include @@ -8,7 +8,7 @@ class Snmp; class CTarget; -namespace GTS { +namespace SSMD { class Settings; class Subscriber; diff --git a/include/syncer.h b/include/syncer.h index 5d5aaa7..f345a64 100644 --- a/include/syncer.h +++ b/include/syncer.h @@ -1,5 +1,5 @@ -#ifndef __GTS_SYNCER_H__ -#define __GTS_SYNCER_H__ +#ifndef __SSMD_SYNCER_H__ +#define __SSMD_SYNCER_H__ #include #include @@ -9,7 +9,7 @@ class Snmp; -namespace GTS { +namespace SSMD { class SettingsParser; class Switch; diff --git a/include/version.h.in b/include/version.h.in index e4db5ca..d69628b 100644 --- a/include/version.h.in +++ b/include/version.h.in @@ -1,9 +1,9 @@ -#ifndef __GTS_VERSION_H__ -#define __GTS_VERSION_H__ +#ifndef __SSMD_VERSION_H__ +#define __SSMD_VERSION_H__ #include -namespace GTS { +namespace SSMD { static const std::string version("@VERSION@"); static const std::string revision("git sha @GIT_SHA@"); } diff --git a/src/acl.cpp b/src/acl.cpp index a835f0e..f3f6b77 100644 --- a/src/acl.cpp +++ b/src/acl.cpp @@ -7,7 +7,7 @@ #include "oids.h" #include "logger.h" -using GTS::ACL; +using SSMD::ACL; ACL::ACL(unsigned id, unsigned profileId, @@ -106,7 +106,7 @@ void ACL::appendPdu(Pdu & pdu) const pdu += vb;*/ } -std::ostream & GTS::operator<<(std::ostream & stream, const ACL & acl) +std::ostream & SSMD::operator<<(std::ostream & stream, const ACL & acl) { std::string oidValue; // MAC diff --git a/src/dataparser.cpp b/src/dataparser.cpp index f83dbe5..2427af7 100644 --- a/src/dataparser.cpp +++ b/src/dataparser.cpp @@ -10,11 +10,11 @@ namespace qi = boost::spirit::qi; -using GTS::LineType; -using GTS::Lines; +using SSMD::LineType; +using SSMD::Lines; BOOST_FUSION_ADAPT_STRUCT( - GTS::LineType, + SSMD::LineType, (std::string, switchIP) (std::string, readCommunity) (std::string, writeCommunity) @@ -68,7 +68,7 @@ struct LinesGrammar qi::rule eol; }; -bool GTS::parseData(std::string & data, Lines & lines) +bool SSMD::parseData(std::string & data, Lines & lines) { std::string::iterator begin(data.begin()); std::string::iterator end(data.end()); diff --git a/src/logger.cpp b/src/logger.cpp index 13e1f0f..295c7b1 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -2,7 +2,7 @@ #include "logger.h" -using GTS::Logger; +using SSMD::Logger; bool Logger::setLogFile(const std::string & fileName) { diff --git a/src/main.cpp b/src/main.cpp index c0c71ae..1b1d74b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,7 +14,7 @@ #include "pidfile.h" #include "logger.h" -GTS::Logger logger; +SSMD::Logger logger; static bool running = true; static bool reload = false; @@ -22,7 +22,7 @@ void setSignalHandlers(); int main(int argc, char * argv[]) { - GTS::SettingsParser sParser; + SSMD::SettingsParser sParser; // Set filter for logging DefaultLog::log()->set_filter(ERROR_LOG, 7); @@ -45,7 +45,7 @@ int main(int argc, char * argv[]) } if (sParser.settings().isVersion()) { - std::cout << "GTS SNMP Switch Management Daemon " << GTS::version << " (revision: " << GTS::revision << ")" << std::endl; + std::cout << "SNMP Switch Management Daemon " << SSMD::version << " (revision: " << SSMD::revision << ")" << std::endl; return 0; } @@ -83,10 +83,10 @@ int main(int argc, char * argv[]) return -1; } - GTS::PIDFile pf(sParser.settings().PIDFile()); - GTS::Syncer syncer(sParser, snmp); + SSMD::PIDFile pf(sParser.settings().PIDFile()); + SSMD::Syncer syncer(sParser, snmp); - logger << "Starting gssmd main thread..." << std::endl; + logger << "Starting ssmd main thread..." << std::endl; setSignalHandlers(); diff --git a/src/pidfile.cpp b/src/pidfile.cpp index 1b0ecbd..99cea9c 100644 --- a/src/pidfile.cpp +++ b/src/pidfile.cpp @@ -8,7 +8,7 @@ #include "pidfile.h" #include "logger.h" -using GTS::PIDFile; +using SSMD::PIDFile; PIDFile::PIDFile() : fileName("/var/run/gssmd.pid") diff --git a/src/settings.cpp b/src/settings.cpp index 330a574..4271faf 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1,8 +1,8 @@ #include "logger.h" #include "settings.h" -using GTS::Settings; -using GTS::SettingsParser; +using SSMD::Settings; +using SSMD::SettingsParser; SettingsParser::SettingsParser() : _desc("Allowed options") diff --git a/src/settingsfileparser.cpp b/src/settingsfileparser.cpp index 10514ce..bf2fda2 100644 --- a/src/settingsfileparser.cpp +++ b/src/settingsfileparser.cpp @@ -72,7 +72,7 @@ bool fieldValue(const SectionsType & data, const std::string & sectionName, cons } -using GTS::SettingsParser; +using SSMD::SettingsParser; void SettingsParser::parseFile(const std::string & fileName) { diff --git a/src/snmptable.cpp b/src/snmptable.cpp index e729b05..d9f8ae6 100644 --- a/src/snmptable.cpp +++ b/src/snmptable.cpp @@ -1,7 +1,7 @@ #include "snmptable.h" #include "logger.h" -using GTS::SNMPTable; +using SSMD::SNMPTable; SNMPTable::SNMPTable(Snmp & snmp, const CTarget & target, diff --git a/src/subscriber.cpp b/src/subscriber.cpp index 046d29b..4ae0735 100644 --- a/src/subscriber.cpp +++ b/src/subscriber.cpp @@ -1,6 +1,6 @@ #include "subscriber.h" -using GTS::Subscriber; +using SSMD::Subscriber; Subscriber::Subscriber(const std::string & mac, unsigned port, diff --git a/src/switch.cpp b/src/switch.cpp index 8b7e281..444324b 100644 --- a/src/switch.cpp +++ b/src/switch.cpp @@ -12,8 +12,8 @@ #include "snmptable.h" #include "oids.h" -using GTS::Switch; -using GTS::SNMPTable; +using SSMD::Switch; +using SSMD::SNMPTable; Switch::Switch(const Settings & settings, Snmp & snmp, diff --git a/src/syncer.cpp b/src/syncer.cpp index b9da80b..b8a22b2 100644 --- a/src/syncer.cpp +++ b/src/syncer.cpp @@ -18,11 +18,11 @@ #include "datatypes.h" #include "logger.h" -using GTS::Syncer; -using GTS::Timer; -using GTS::Switch; -using GTS::Subscriber; -using GTS::Lines; +using SSMD::Syncer; +using SSMD::Timer; +using SSMD::Switch; +using SSMD::Subscriber; +using SSMD::Lines; Timer::Timer(boost::function callback, time_t interval) : _interval(interval), diff --git a/gssmd.conf b/ssmd.conf similarity index 67% rename from gssmd.conf rename to ssmd.conf index 4daf70b..69724eb 100644 --- a/gssmd.conf +++ b/ssmd.conf @@ -10,12 +10,12 @@ daemon #debug # Log file path -# Default: /var/log/gssmd.log -log_file = /home/faust/Projects/GTS/snmp-daemon/gssmd.log +# Default: /var/log/ssmd.log +log_file = /var/log/ssmd.log # PID file path -# Default: /var/run/gssmd.pid -pid_file = /home/faust/Projects/GTS/snmp-daemon/gssmd.pid +# Default: /var/run/ssmd.pid +pid_file = /var/run/ssmd.pid [sync] @@ -37,4 +37,4 @@ down_profile_id = 2 # Data access URL # No default value -data_url = http://db.loc/?mm=api&mode=sh_switches +data_url = http://localhost diff --git a/tests/test_data_parser.cpp b/tests/test_data_parser.cpp index 3c3292e..4ce17eb 100644 --- a/tests/test_data_parser.cpp +++ b/tests/test_data_parser.cpp @@ -3,11 +3,11 @@ #include "datatypes.h" #include "logger.h" -GTS::Logger logger; +SSMD::Logger logger; int main() { - GTS::Lines lines; + SSMD::Lines lines; std::string data( "172.16.47.10,gts_community_r,gts_community_w,10,1,001CC0B16177,64,128,64,128\n" "172.16.47.11,gts_community_r,gts_community_w,10,1,001CC0B16178,65,129,66,138\n" @@ -20,7 +20,7 @@ int main() if (!parseData(data, lines)) { logger << "Failed to parse data" << std::endl; } else { - GTS::Lines::const_iterator it; + SSMD::Lines::const_iterator it; for (it = lines.begin(); it != lines.end(); ++it) { logger << "line: " << it->switchIP << "," diff --git a/tests/test_switch.cpp b/tests/test_switch.cpp index 7d68c0f..e32af53 100644 --- a/tests/test_switch.cpp +++ b/tests/test_switch.cpp @@ -8,11 +8,11 @@ #include "subscriber.h" #include "logger.h" -GTS::Logger logger; +SSMD::Logger logger; int main() { - GTS::Settings settings; + SSMD::Settings settings; settings.setIsDebug(true); settings.setUpProfileId(1); @@ -26,7 +26,7 @@ int main() return -1; } - GTS::Switch sw(settings, + SSMD::Switch sw(settings, snmp, "172.16.47.10", "gts_community_r", @@ -34,7 +34,7 @@ int main() 10); sw.addSubscriber( - GTS::Subscriber( + SSMD::Subscriber( "485b3936a273", 1, 8192, -- 2.43.2