Removed GTS string.

diff --git a/Makefile b/Makefile
index 94f157442ef5e3dadeb3aeb6a920c6e3832603c3..1d3630f8ebbd59aec03bdfea866b86c792108764 100644 (file)
--- 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/gssmd.conf b/gssmd.conf
deleted file mode 100644 (file)
index 4daf70b..0000000
--- a/gssmd.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-[general]
-
-# 'daemon' flag defines whether to daemonize or no
-# Default - no
-daemon
-
-
-# 'debug' flag make output a bit more verbose
-# Default - no
-#debug
-
-# Log file path
-# Default: /var/log/gssmd.log
-log_file = /home/faust/Projects/GTS/snmp-daemon/gssmd.log
-
-# PID file path
-# Default: /var/run/gssmd.pid
-pid_file = /home/faust/Projects/GTS/snmp-daemon/gssmd.pid
-
-[sync]
-
-# Switch sync interval, sec
-# Default: 60 sec
-switch_interval = 1
-
-# Info sync interval, sec
-# Default: 180 sec
-info_interval = 10
-
-# Upload profile ID
-# Default: 1
-up_profile_id = 1
-
-# Download profile ID
-# Default: 1
-down_profile_id = 2
-
-# Data access URL
-# No default value
-data_url = http://db.loc/?mm=api&mode=sh_switches

diff --git a/include/acl.h b/include/acl.h
index f2754466c8e112d4c6517dee44fb8506ef8037ea..cee7cb3517305c90b168a2b577407fb2bf4b46a1 100644 (file)
--- 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 <string>
 #include <ostream>
 
 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 28983df3d50474189b80b0bfc0ea8d367ccf1421..723e20ded26d1a42c318df9583f795e0c5db9396 100644 (file)
--- 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 <string>
 #include <list>
 
-namespace GTS {
+namespace SSMD {
 
 struct LineType {
     std::string switchIP;

diff --git a/include/logger.h b/include/logger.h
index 35d3e46aeb246c817f3b90410684848ca8947bee..7207003a92c998fd07808d37f73f645905ec82f5 100644 (file)
--- 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 <iostream>
 #include <fstream>
@@ -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 5f11291959475094c381436d2dcf66b9b4246501..7526b1f76c8bf979038768959666cd557117fb1c 100644 (file)
--- 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 d2422bd29effbc6c3a91fd07a4e6f84863395905..ba9adec412cb586a59b4e40c2830a1aa0471576f 100644 (file)
--- 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 <string>
 
 #include <boost/noncopyable.hpp>
 
-namespace GTS {
+namespace SSMD {
 
 class PIDFile : private boost::noncopyable {
     public:

diff --git a/include/settings.h b/include/settings.h
index e384a423ee584ae44c77965661253881fbd67ef6..c88f94a6c7694f5a29ee19265390926641776d12 100644 (file)
--- 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 <string>
 
@@ -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 1c771ced8dc42b2df16d6402d6f5f96f85d1dc8d..dbc275cb852fcc7ee8854a07b3872b1819a5f775 100644 (file)
--- 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 <iostream>
 #include <sstream>
 
-namespace GTS {
+namespace SSMD {
 
 inline
 Settings::Settings()

diff --git a/include/snmptable.h b/include/snmptable.h
index 81efb56dec9125d1afc3d0637004c1333e65cc6e..0175a2f15a9232af68dbf3d155df1d38bf0a2deb 100644 (file)
--- 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 <list>
 
 #include "snmp_pp/snmp_pp.h"
 
-namespace GTS {
+namespace SSMD {
 
 typedef std::list<Vb> SNMPList;
 

diff --git a/include/snmptable.inl.h b/include/snmptable.inl.h
index 63ff217e55b73e9739612d2f0e66cd0f34a4feac..b113af6d03b98dcf9ebad768610e8ade33f4da64 100644 (file)
--- 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 <typename T>
 inline

diff --git a/include/subscriber.h b/include/subscriber.h
index 44d6db3b6c1ec4ea8872e655bb0095904df2088a..11bf1c267ccdaf902718fa7f5a3db93a95ddbabc 100644 (file)
--- 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 <string>
 
-namespace GTS {
+namespace SSMD {
 
 class Subscriber {
     public:

diff --git a/include/switch.h b/include/switch.h
index bf585c5a4261f2003b76cf751d5f5854b522e8d7..bd9965280cc22f54b87ee65213c1af37afc5640c 100644 (file)
--- 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 <string>
 #include <vector>
@@ -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 5d5aaa772eea157bb82220bba0c13c85e8ba2d6f..f345a64c3527b5de72e32b87c2f0d94e572b9917 100644 (file)
--- 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 <ctime>
 #include <list>
@@ -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 e4db5caf34ba9a67c4c77a2c5c91d51d234ab609..d69628b559dcc56859f51fd2074c9a36b7e48f54 100644 (file)
--- 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 <string>
 
-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 a835f0ebc6a406e7db27495f277f89cd275f75b2..f3f6b778788481e3081c0bf3bfac6cfb76bd3a45 100644 (file)
--- 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 f83dbe570498873f1d0ada26fc17c68eea941eb0..2427af7b5cd820b47daa3c828a3d92e2e4f52f54 100644 (file)
--- 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<Iterator> 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 13e1f0f33980aa13de1aa675760977b9f14185a1..295c7b1be8c32dafb137944519dc027f263630ef 100644 (file)
--- 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 c0c71ae7ba5274eabf5d3185cc2bb1a75f7bbc71..1b1d74b8fb5faff3cdc6eb84c811b273811b4bf6 100644 (file)
--- 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 1b0ecbd1ce04037f9f907f6eb276cd54ce21efc4..99cea9c9ee0e3f18619f8615222cacaeb6d9bdf9 100644 (file)
--- 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 330a574ea20f9ff7d2c8e72ed37c7763d1ca28a7..4271faf0436c5493dc253dfc2bd44509e1c36dda 100644 (file)
--- 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 10514ce7cb4c960808e2f54fc5215f979be9ace6..bf2fda2ca27a2bb92c0c023da7c36df21947162d 100644 (file)
--- 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 e729b058ca4c65d2a3e7e11ef3b752c1c9fbf10f..d9f8ae6ea682ee78bd19c0e971eefd0337b131a0 100644 (file)
--- 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 046d29b396251a22173652ab7d08659b818729b6..4ae07354a045539b49a38b16ac843fe51c0c9b95 100644 (file)
--- 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 8b7e281848be2879d392de3ac29004ce622e0cf0..444324b946edeb84179eb67a9a6f02fc06e75ec7 100644 (file)
--- 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 b9da80bb96a919eb21784f3baf0faac6b9c1cbf3..b8a22b2ae3c7836aa31cfa4b10f143552ac3f2c4 100644 (file)
--- 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<void ()> callback, time_t interval)
     : _interval(interval),

diff --git a/ssmd.conf b/ssmd.conf
new file mode 100644 (file)
index 0000000..69724eb
--- /dev/null
+++ b/ssmd.conf
@@ -0,0 +1,40 @@
+[general]
+
+# 'daemon' flag defines whether to daemonize or no
+# Default - no
+daemon
+
+
+# 'debug' flag make output a bit more verbose
+# Default - no
+#debug
+
+# Log file path
+# Default: /var/log/ssmd.log
+log_file = /var/log/ssmd.log
+
+# PID file path
+# Default: /var/run/ssmd.pid
+pid_file = /var/run/ssmd.pid
+
+[sync]
+
+# Switch sync interval, sec
+# Default: 60 sec
+switch_interval = 1
+
+# Info sync interval, sec
+# Default: 180 sec
+info_interval = 10
+
+# Upload profile ID
+# Default: 1
+up_profile_id = 1
+
+# Download profile ID
+# Default: 1
+down_profile_id = 2
+
+# Data access URL
+# No default value
+data_url = http://localhost

diff --git a/tests/test_data_parser.cpp b/tests/test_data_parser.cpp
index 3c3292e32ba82b0763917018adab5f43963f4dcb..4ce17eb5d5781178a4ba280801d6266cf0e07afe 100644 (file)
--- 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 7d68c0f536473f03d7d3c1a1f70ad55035580c2e..e32af53e1a2b530d3be3806383138b08a562c71a 100644 (file)
--- 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,