*/
#include "inspircd.h"
-#include <string>
-#include "configreader.h"
#include "socket.h"
#include "socketengine.h"
#include "wildcard.h"
{
ServerInstance->SE->DelFd(this);
ServerInstance->Log(DEBUG,"Shut down listener on fd %d", this->fd);
- if (shutdown(this->fd, 2) || close(this->fd))
+ if (ServerInstance->SE->Shutdown(this, 2) || ServerInstance->SE->Close(this))
ServerInstance->Log(DEBUG,"Failed to cancel listener: %s", strerror(errno));
this->fd = -1;
}
length = sizeof(sockaddr_in);
}
- incomingSockfd = _accept (this->GetFd(), (sockaddr*)client, &length);
+ incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length);
- if ((incomingSockfd > -1) && (!_getsockname(incomingSockfd, sock_us, &uslen)))
+ if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen)))
{
char buf[MAXBUF];
#ifdef IPV6
in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
}
- NonBlocking(incomingSockfd);
+ ServerInstance->SE->NonBlocking(incomingSockfd);
+
if (ServerInstance->Config->GetIOHook(in_port))
{
try
}
else
{
- shutdown(incomingSockfd,2);
- close(incomingSockfd);
+ ServerInstance->SE->Shutdown(incomingSockfd, 2);
+ ServerInstance->SE->Close(incomingSockfd);
ServerInstance->stats->statsRefused++;
}
delete[] client;
/* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */
bool irc::sockets::MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits)
{
- unsigned int modulus = mask_bits % 8; /* Number of whole bytes in the mask */
- unsigned int divisor = mask_bits / 8; /* Remaining bits in the mask after whole bytes are dealt with */
+ unsigned int divisor = mask_bits / 8; /* Number of whole bytes in the mask */
+ unsigned int modulus = mask_bits % 8; /* Remaining bits in the mask after whole bytes are dealt with */
- /* First compare the whole bytes, if they dont match, return false */
- if (memcmp(address, mask, divisor))
- return false;
-
- /* Now if there are any remainder bits, we compare them with logic AND */
+ /* First (this is faster) compare the odd bits with logic ops */
if (modulus)
if ((address[divisor] & inverted_bits[modulus]) != (mask[divisor] & inverted_bits[modulus]))
/* If they dont match, return false */
return false;
+ /* Secondly (this is slower) compare the whole bytes */
+ if (memcmp(address, mask, divisor))
+ return false;
+
/* The address matches the mask, to mask_bits bits of mask */
return true;
}
return MatchCIDRBits(addr_raw, mask_raw, bits);
}
-void irc::sockets::Blocking(int s)
-{
-#ifndef WIN32
- int flags = fcntl(s, F_GETFL, 0);
- fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
-#else
- unsigned long opt = 0;
- ioctlsocket(s, FIONBIO, &opt);
-#endif
-}
-
-void irc::sockets::NonBlocking(int s)
-{
-#ifndef WIN32
- int flags = fcntl(s, F_GETFL, 0);
- fcntl(s, F_SETFL, flags | O_NONBLOCK);
-#else
- unsigned long opt = 1;
- ioctlsocket(s, FIONBIO, &opt);
-#endif
-}
-
/** This will bind a socket to a port. It works for UDP/TCP.
* It can only bind to IP addresses, if you wish to bind to hostnames
* you should first resolve them using class 'Resolver'.
((sockaddr_in*)server)->sin_port = htons(port);
size = sizeof(sockaddr_in);
#endif
- ret = bind(sockfd, server, size);
+ ret = SE->Bind(sockfd, server, size);
delete[] server;
if (ret < 0)
{
if (dolisten)
{
- if (listen(sockfd, Config->MaxConn) == -1)
+ if (SE->Listen(sockfd, Config->MaxConn) == -1)
{
this->Log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
return false;
else
{
this->Log(DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
- NonBlocking(sockfd);
+ SE->NonBlocking(sockfd);
return true;
}
}
Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF);
Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF);
Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
-
+
+ if (strncmp(Addr, "::ffff:", 7) == 0)
+ this->Log(DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
+
if ((!*Type) || (!strcmp(Type,"clients")))
{
irc::portparser portrange(configToken, false);