* ---------------------------------------------------
*/
-#include <string>
-#include "configreader.h"
-#include "socket.h"
#include "inspircd.h"
+#include "socket.h"
#include "socketengine.h"
#include "wildcard.h"
* ((-1) << (8 - (mask % 8)))
* But imho, it sucks in comparison to a nice neat lookup table.
*/
-const char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits - never actually used */
+const unsigned char inverted_bits[8] = { 0x00, /* 00000000 - 0 bits - never actually used */
0x80, /* 10000000 - 1 bits */
0xC0, /* 11000000 - 2 bits */
0xE0, /* 11100000 - 3 bits */
if ((!*addr) || (strchr(addr,':')))
this->family = AF_INET6;
else
- this->family = AF_INET;
-#else
- this->family = AF_INET;
#endif
+ this->family = AF_INET;
Instance->SE->AddFd(this);
}
}
{
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_in6);
}
else
+#endif
{
uslen = sizeof(sockaddr_in);
length = sizeof(sockaddr_in);
}
-#else
- uslen = sizeof(sockaddr_in);
- length = sizeof(sockaddr_in);
-#endif
- incomingSockfd = accept (this->GetFd(), (sockaddr*)client, &length);
- if ((incomingSockfd > -1) && (!getsockname(incomingSockfd, sock_us, &uslen)))
+ incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length);
+
+ if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen)))
{
char buf[MAXBUF];
#ifdef IPV6
in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port);
}
else
+#endif
{
inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
}
-#else
- inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
- in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
-#endif
- NonBlocking(incomingSockfd);
+
+ ServerInstance->SE->NonBlocking(incomingSockfd);
+
if (ServerInstance->Config->GetIOHook(in_port))
{
try
}
else
{
- shutdown(incomingSockfd,2);
+ ServerInstance->SE->Shutdown(incomingSockfd, 2);
close(incomingSockfd);
ServerInstance->stats->statsRefused++;
}
/* 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 */
-
- /* First compare the whole bytes, if they dont match, return false */
- if (memcmp(address, mask, divisor))
- return false;
+ 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 */
- /* 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)
-{
- int flags = fcntl(s, F_GETFL, 0);
- fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
-}
-
-void irc::sockets::NonBlocking(int s)
-{
- int flags = fcntl(s, F_GETFL, 0);
- fcntl(s, F_SETFL, flags | O_NONBLOCK);
-}
-
/** 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;
}
}
}
else
{
- setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+ setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
/* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */
linger.l_onoff = 1;
linger.l_linger = 1;
- setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger,sizeof(linger));
+ setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (char*)&linger,sizeof(linger));
return (sockfd);
}
}
-/* XXX: Probably belongs in class InspIRCd */
int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports)
{
char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
int bound = 0;
+ bool started_with_nothing = (Config->ports.size() == 0);
+ std::vector<std::pair<std::string, int> > old_ports;
+
+ /* XXX: Make a copy of the old ip/port pairs here */
+ for (std::vector<ListenSocket*>::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o)
+ old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort()));
for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
{
bool skip = false;
for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+ {
if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
+ {
skip = true;
+ /* XXX: Here, erase from our copy of the list */
+ for (std::vector<std::pair<std::string, int> >::iterator k = old_ports.begin(); k != old_ports.end(); ++k)
+ {
+ if ((k->first == Addr) && (k->second == portno))
+ {
+ old_ports.erase(k);
+ break;
+ }
+ }
+ }
+ }
if (!skip)
{
ListenSocket* ll = new ListenSocket(this, portno, Addr);
}
}
}
+
+ /* XXX: Here, anything left in our copy list, close as removed */
+ if (!started_with_nothing)
+ {
+ for (size_t k = 0; k < old_ports.size(); ++k)
+ {
+ for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+ {
+ if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
+ {
+ this->Log(DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second);
+ delete *n;
+ Config->ports.erase(n);
+ break;
+ }
+ }
+ }
+ }
+
return bound;
}