#include <string>
#include <vector>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <string.h>
-#include <unistd.h>
-
#include <gnutls/gnutls.h>
#include "inspircd_config.h"
enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED };
-bool isin(int port, std::vector<int> portlist)
+bool isin(int port, const std::vector<int> &portlist)
{
for(unsigned int i = 0; i < portlist.size(); i++)
if(portlist[i] == port)
int fd;
};
-class ModuleSSL : public Module
+class ModuleSSLGnuTLS : public Module
{
Server* Srv;
ServerConfig* SrvConf;
public:
- ModuleSSL(Server* Me)
+ ModuleSSLGnuTLS(Server* Me)
: Module::Module(Me)
{
Srv = Me;
SrvConf = Srv->GetConfig();
- Conf = new ConfigReader;
// Not rehashable...because I cba to reduce all the sizes of existing buffers.
inbufsize = SrvConf->NetBufferSize;
if(param != "ssl")
return;
- delete Conf;
Conf = new ConfigReader;
for(unsigned int i = 0; i < listenports.size(); i++)
{
// Get the port we're meant to be listening on with SSL
unsigned int port = Conf->ReadInteger("bind", "port", i, true);
- SrvConf->AddIOHook(port, this);
-
- // We keep a record of which ports we're listening on with SSL
- listenports.push_back(port);
+ if(SrvConf->AddIOHook(port, this))
+ {
+ // We keep a record of which ports we're listening on with SSL
+ listenports.push_back(port);
- log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", port);
+ log(DEFAULT, "m_ssl_gnutls.so: Enabling SSL for port %d", port);
+ }
+ else
+ {
+ log(DEFAULT, "m_ssl_gnutls.so: FAILED to enable SSL on port %d, maybe you have another ssl or similar module loaded?", port);
+ }
}
}
log(DEFAULT, "m_ssl_gnutls.so: Failed to generate DH parameters (%d bits)", dh_bits);
}
- virtual ~ModuleSSL()
+ virtual ~ModuleSSLGnuTLS()
{
delete Conf;
gnutls_dh_params_deinit(dh_params);
}
};
-class ModuleSSLFactory : public ModuleFactory
+class ModuleSSLGnuTLSFactory : public ModuleFactory
{
public:
- ModuleSSLFactory()
+ ModuleSSLGnuTLSFactory()
{
}
- ~ModuleSSLFactory()
+ ~ModuleSSLGnuTLSFactory()
{
}
virtual Module * CreateModule(Server* Me)
{
- return new ModuleSSL(Me);
+ return new ModuleSSLGnuTLS(Me);
}
};
extern "C" void * init_module( void )
{
- return new ModuleSSLFactory;
+ return new ModuleSSLGnuTLSFactory;
}