Replace SocketEngine::GetName() with INSPIRCD_SOCKETENGINE_NAME define

diff --git a/configure b/configure
index 2f92d9f168a57df7f1f1a68da833f2e09bc26f58..4db9064b986f6d1d3f3381d7065cbf859d58df0e 100755 (executable)
--- a/configure
+++ b/configure
@@ -455,6 +455,7 @@ sub writefiles {
 #define VERSION "$version"
 #define REVISION "$revision"
 #define SYSTEM "$incos"
+#define INSPIRCD_SOCKETENGINE_NAME "$config{SOCKETENGINE}"
 
 #define CONFIG_PATH "$config{CONFIG_DIR}"
 #define DATA_PATH "$config{DATA_DIR}"

diff --git a/include/socketengine.h b/include/socketengine.h
index b57113af0fefd75133eb1ba030d8b94e57f36569..a2179d951e7ee5726d3dda5617bb803380397b41 100644 (file)
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -358,12 +358,6 @@ public:
         */
        virtual void DispatchTrialWrites();
 
-       /** Returns the socket engines name.  This returns the name of the
-        * engine for use in /VERSION responses.
-        * @return The socket engine name
-        */
-       virtual std::string GetName() = 0;
-
        /** Returns true if the file descriptors in the given event handler are
         * within sensible ranges which can be handled by the socket engine.
         */

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 11809e8931f073e1c3901ef9418a44e7d61da65a..e94ee25049c95d22a55866dff14160210782c7a8 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -107,7 +107,7 @@ class ModuleHttpStats : public Module
                                data << "<usercount>" << ServerInstance->Users->clientlist->size() << "</usercount>";
                                data << "<channelcount>" << ServerInstance->chanlist->size() << "</channelcount>";
                                data << "<opercount>" << ServerInstance->Users->all_opers.size() << "</opercount>";
-                               data << "<socketcount>" << (ServerInstance->SE->GetUsedFds()) << "</socketcount><socketmax>" << ServerInstance->SE->GetMaxFds() << "</socketmax><socketengine>" << ServerInstance->SE->GetName() << "</socketengine>";
+                               data << "<socketcount>" << (ServerInstance->SE->GetUsedFds()) << "</socketcount><socketmax>" << ServerInstance->SE->GetMaxFds() << "</socketmax><socketengine>" INSPIRCD_SOCKETENGINE_NAME "</socketengine>";
 
                                time_t current_time = 0;
                                current_time = ServerInstance->Time();

diff --git a/src/server.cpp b/src/server.cpp
index 1d1f5264191e3afb4b87c79c34fe1f8a5b9c2d60..5590f05f907091f88d0558421929434a03e21363 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -68,7 +68,7 @@ void InspIRCd::Rehash(const std::string& uuid)
 std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
        if (getFullVersion)
-               return VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," + SE->GetName() + "," + Config->sid + "]";
+               return VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
        return BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
 }
 

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index 09fa918c6887adf09e2e6b50e1b623a4bc96f420..800cc76570b811e6174de6e851d298f50b7b6690 100644 (file)
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -49,7 +49,6 @@ public:
        virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
        virtual void DelFd(EventHandler* eh);
        virtual int DispatchEvents();
-       virtual std::string GetName();
 };
 
 EPollEngine::EPollEngine() : events(1)
@@ -255,11 +254,6 @@ int EPollEngine::DispatchEvents()
        return i;
 }
 
-std::string EPollEngine::GetName()
-{
-       return "epoll";
-}
-
 SocketEngine* CreateSocketEngine()
 {
        return new EPollEngine;

diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index 07ea19d9dcce27f0990fc642ffeaeaec3f1abc8e..53bd741f066ecee2562797eae06e74cba3e207b5 100644 (file)
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -51,7 +51,6 @@ public:
        void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
        virtual void DelFd(EventHandler* eh);
        virtual int DispatchEvents();
-       virtual std::string GetName();
        virtual void RecoverFromFork();
 };
 
@@ -255,11 +254,6 @@ int KQueueEngine::DispatchEvents()
        return i;
 }
 
-std::string KQueueEngine::GetName()
-{
-       return "kqueue";
-}
-
 SocketEngine* CreateSocketEngine()
 {
        return new KQueueEngine;

diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index 2919988c0fbf6c599e22656dbdb3d636ad25e87f..53953626f9dc5bac798ac546a470945069d5eb63 100644 (file)
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -60,7 +60,6 @@ public:
        virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
        virtual void DelFd(EventHandler* eh);
        virtual int DispatchEvents();
-       virtual std::string GetName();
 };
 
 PollEngine::PollEngine() : events(1), fd_mappings(1)
@@ -246,11 +245,6 @@ int PollEngine::DispatchEvents()
        return i;
 }
 
-std::string PollEngine::GetName()
-{
-       return "poll";
-}
-
 SocketEngine* CreateSocketEngine()
 {
        return new PollEngine;

diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp
index 098e7511662ecc343751516ee404f7f9007b5a18..74c36712bad0213e786288a68a79c55c593fb414 100644 (file)
--- a/src/socketengines/socketengine_ports.cpp
+++ b/src/socketengines/socketengine_ports.cpp
@@ -54,7 +54,6 @@ public:
        virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
        virtual void DelFd(EventHandler* eh);
        virtual int DispatchEvents();
-       virtual std::string GetName();
 };
 
 PortsEngine::PortsEngine() : events(1)
@@ -194,11 +193,6 @@ int PortsEngine::DispatchEvents()
        return (int)i;
 }
 
-std::string PortsEngine::GetName()
-{
-       return "ports";
-}
-
 SocketEngine* CreateSocketEngine()
 {
        return new PortsEngine;

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index 82fe0bb6b0ce874d9f953f7a247fbba3b8d62554..e9d7a96602c6410df8168d43e010d6f3ffc5edea 100644 (file)
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -41,7 +41,6 @@ public:
        virtual void DelFd(EventHandler* eh);
        void OnSetEvent(EventHandler* eh, int, int);
        virtual int DispatchEvents();
-       virtual std::string GetName();
 };
 
 SelectEngine::SelectEngine()
@@ -173,11 +172,6 @@ int SelectEngine::DispatchEvents()
        return sresult;
 }
 
-std::string SelectEngine::GetName()
-{
-       return "select";
-}
-
 SocketEngine* CreateSocketEngine()
 {
        return new SelectEngine;

diff --git a/win/config.h.cmake b/win/config.h.cmake
index 081163fab59551461c4e060a08aaa4dab7828539..3a34a706b61a5c565b895ffbe5fa80a9a166642a 100644 (file)
--- a/win/config.h.cmake
+++ b/win/config.h.cmake
@@ -4,6 +4,7 @@
 #define VERSION "@FULL_VERSION@"\r
 #define REVISION "release"\r
 #define SYSTEM "@CMAKE_SYSTEM@"\r
+#define INSPIRCD_SOCKETENGINE_NAME "select"\r
 \r
 #define CONFIG_PATH "@CONF_PATH@"\r
 #define MOD_PATH "@MODULE_PATH@"\r