summaryrefslogtreecommitdiff
path: root/src/modules/extra
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-11 15:17:40 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-11-11 15:17:40 +0000
commit69c3a32784b8c638ea10c269c3f63ede86b8aaa0 (patch)
treeee065fbe0bbeaf3121ff359e2cca3671b426de08 /src/modules/extra
parent0b230aa96b81b7a6426e48a509a19699556cf190 (diff)
Add irc::portparser, a class to parse port ranges in the form "6660,6661,6662-6669,7000".
Needs testing, watch next few commits. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5690 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/extra')
-rw-r--r--src/modules/extra/m_ssl_gnutls.cpp47
-rw-r--r--src/modules/extra/m_ssl_openssl.cpp47
2 files changed, 14 insertions, 80 deletions
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index fafb646e1..863b503cf 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -118,51 +118,18 @@ class ModuleSSLGnuTLS : public Module
{
// Get the port we're meant to be listening on with SSL
std::string port = Conf->ReadValue("bind", "port", i);
- irc::commasepstream portrange(port);
- std::string portno = "*";
- while ((portno = portrange.GetToken()) != "")
+ irc::portparser portrange(port);
+ long portno = -1;
+ while ((portno = portrange.GetToken()))
{
- std::string::size_type dash = portno.rfind('-');
- if (dash != std::string::npos)
+ if (ServerInstance->Config->AddIOHook(portno, this))
{
- std::string sbegin = portno.substr(0, dash);
- std::string send = portno.substr(dash+1, portno.length());
- long begin = atoi(sbegin.c_str());
- long end = atoi(send.c_str());
- if ((begin < 0) || (end < 0) || (begin > 65535) || (end > 65535) || (begin >= end))
- {
- ServerInstance->Log(DEFAULT,"WARNING: Port range \"%d-%d\" discarded. begin >= end, or begin/end out of range.", begin, end);
- }
- else
- {
- for (int portval = begin; portval <= end; ++portval)
- {
- if (ServerInstance->Config->AddIOHook(portval, this))
- {
- listenports.push_back(portval);
- ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", portval);
- }
- else
- {
- ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?",
- portval);
- }
- }
- }
+ listenports.push_back(portno);
+ ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", portno);
}
else
{
- if (ServerInstance->Config->AddIOHook(atoi(portno.c_str()), this))
- {
- // We keep a record of which ports we're listening on with SSL
- listenports.push_back(atoi(portno.c_str()));
-
- ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %s", portno.c_str());
- }
- else
- {
- ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: FAILED to enable SSL on port %s, maybe you have another ssl or similar module loaded?", portno.c_str());
- }
+ ServerInstance->Log(DEFAULT, "m_ssl_gnutls.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", portno);
}
}
}
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 2acd78d0e..d1521ad4d 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -143,51 +143,18 @@ class ModuleSSLOpenSSL : public Module
{
// Get the port we're meant to be listening on with SSL
std::string port = Conf->ReadValue("bind", "port", i);
- irc::commasepstream portrange(port);
- std::string portno = "*";
- while ((portno = portrange.GetToken()) != "")
+ irc::portparser portrange(port);
+ long portno = -1;
+ while ((portno = portrange.GetToken()))
{
- std::string::size_type dash = portno.rfind('-');
- if (dash != std::string::npos)
+ if (ServerInstance->Config->AddIOHook(portno, this))
{
- std::string sbegin = portno.substr(0, dash);
- std::string send = portno.substr(dash+1, portno.length());
- long begin = atoi(sbegin.c_str());
- long end = atoi(send.c_str());
- if ((begin < 0) || (end < 0) || (begin > 65535) || (end > 65535) || (begin >= end))
- {
- ServerInstance->Log(DEFAULT,"WARNING: Port range \"%d-%d\" discarded. begin >= end, or begin/end out of range.", begin, end);
- }
- else
- {
- for (int portval = begin; portval <= end; ++portval)
- {
- if (ServerInstance->Config->AddIOHook(portval, this))
- {
- listenports.push_back(portval);
- ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", portval);
- }
- else
- {
- ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?",
- portval);
- }
- }
- }
+ listenports.push_back(portno);
+ ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %d", portno);
}
else
{
- if (ServerInstance->Config->AddIOHook(atoi(portno.c_str()), this))
- {
- // We keep a record of which ports we're listening on with SSL
- listenports.push_back(atoi(portno.c_str()));
-
- ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: Enabling SSL for port %s", portno.c_str());
- }
- else
- {
- ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %s, maybe you have another ssl or similar module loaded?", portno.c_str());
- }
+ ServerInstance->Log(DEFAULT, "m_ssl_openssl.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", portno);
}
}
}