* ---------------------------------------------------
*/
+#include "inspircd.h"
#include <string>
#include "configreader.h"
#include "socket.h"
-#include "inspircd.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 */
};
-ListenSocket::ListenSocket(InspIRCd* Instance, int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) : ServerInstance(Instance), desc("plaintext")
+ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port)
{
- this->SetFd(sockfd);
- Instance->Log(DEBUG,"CRAP");
- if (!Instance->BindSocket(this->fd,client,server,port,addr))
- this->fd = -1;
+ this->SetFd(OpenTCPSocket(addr));
+ if (this->GetFd() > -1)
+ {
+ if (!Instance->BindSocket(this->fd,port,addr))
+ this->fd = -1;
+#ifdef IPV6
+ if ((!*addr) || (strchr(addr,':')))
+ this->family = AF_INET6;
+ else
+#endif
+ this->family = AF_INET;
+ Instance->SE->AddFd(this);
+ }
}
ListenSocket::~ListenSocket()
{
if (this->GetFd() > -1)
{
- shutdown(this->fd, 2);
- close(this->fd);
+ ServerInstance->SE->DelFd(this);
+ ServerInstance->Log(DEBUG,"Shut down listener on fd %d", this->fd);
+ if (shutdown(this->fd, 2) || close(this->fd))
+ ServerInstance->Log(DEBUG,"Failed to cancel listener: %s", strerror(errno));
this->fd = -1;
}
}
void ListenSocket::HandleEvent(EventType et, int errornum)
{
- insp_sockaddr sock_us; // our port number
- socklen_t uslen; // length of our port number
- insp_sockaddr client;
- socklen_t length;
+ sockaddr* sock_us = new sockaddr[2]; // our port number
+ sockaddr* client = new sockaddr[2];
+ socklen_t uslen, length; // length of our port number
int incomingSockfd, in_port;
- uslen = sizeof(sock_us);
- length = sizeof(client);
- incomingSockfd = accept (this->GetFd(),(struct sockaddr*)&client, &length);
-
- if ((incomingSockfd > -1) && (!getsockname(incomingSockfd, (sockaddr*)&sock_us, &uslen)))
+
+#ifdef IPV6
+ if (this->family == AF_INET6)
+ {
+ uslen = sizeof(sockaddr_in6);
+ length = sizeof(sockaddr_in6);
+ }
+ else
+#endif
+ {
+ uslen = sizeof(sockaddr_in);
+ length = sizeof(sockaddr_in);
+ }
+
+ incomingSockfd = _accept (this->GetFd(), (sockaddr*)client, &length);
+
+ if ((incomingSockfd > -1) && (!_getsockname(incomingSockfd, sock_us, &uslen)))
{
+ char buf[MAXBUF];
#ifdef IPV6
- in_port = ntohs(sock_us.sin6_port);
-#else
- in_port = ntohs(sock_us.sin_port);
+ if (this->family == AF_INET6)
+ {
+ inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
+ 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);
+ }
+
NonBlocking(incomingSockfd);
if (ServerInstance->Config->GetIOHook(in_port))
{
try
{
-#ifdef IPV6
- ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin6_addr), in_port);
-#else
- ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin_addr), in_port);
-#endif
+ ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, buf, in_port);
}
catch (CoreException& modexcept)
{
}
}
ServerInstance->stats->statsAccept++;
-#ifdef IPV6
- userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, client.sin6_addr);
-#else
- userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, client.sin_addr);
-#endif
+ userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client);
}
else
{
close(incomingSockfd);
ServerInstance->stats->statsRefused++;
}
+ delete[] client;
+ delete[] sock_us;
}
/* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */
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'.
*/
-bool InspIRCd::BindSocket(int sockfd, insp_sockaddr clientn, insp_sockaddr servern, int port, char* addr)
+bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
{
- sockaddr* server = new sockaddr();
- memset(server,0,sizeof(server));
+ /* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
+ sockaddr* server = new sockaddr[2];
+ memset(server,0,sizeof(sockaddr)*2);
+
+ int ret, size;
if (*addr == '*')
*addr = 0;
- Log(DEBUG,"NEW CRAP HERE");
-
- /*if ((*addr) && (insp_aton(addr,&addy) < 1))
- return false;*/
-
#ifdef IPV6
if (*addr)
{
- printf("Address %s not empty\n", addr);
/* There is an address here. Is it ipv6? */
if (strchr(addr,':'))
{
- printf("Address %s is ipv6\n", addr);
/* Yes it is */
in6_addr addy;
- inet_pton(AF_INET6, addr, &addy);
+ if (inet_pton(AF_INET6, addr, &addy) < 1)
+ {
+ delete[] server;
+ return false;
+ }
((sockaddr_in6*)server)->sin6_family = AF_INET6;
- memcpy(&((sockaddr_in6*)server)->sin6_addr, &addy, sizeof(in6_addr));
+ memcpy(&(((sockaddr_in6*)server)->sin6_addr), &addy, sizeof(in6_addr));
((sockaddr_in6*)server)->sin6_port = htons(port);
+ size = sizeof(sockaddr_in6);
}
else
{
/* No, its not */
- printf("Address %s is ipv4\n", addr);
in_addr addy;
- inet_pton(AF_INET, addr, &addy);
+ if (inet_pton(AF_INET, addr, &addy) < 1)
+ {
+ delete[] server;
+ return false;
+ }
((sockaddr_in*)server)->sin_family = AF_INET;
((sockaddr_in*)server)->sin_addr = addy;
((sockaddr_in*)server)->sin_port = htons(port);
+ size = sizeof(sockaddr_in);
}
}
else
{
- printf("Address empty\n");
- /* Theres no address here, default to ipv6 bind to all */
- memset(&((sockaddr_in6*)server)->sin6_addr, 0, sizeof(in6_addr));
- ((sockaddr_in6*)server)->sin6_port = htons(port);
+ if (port == -1)
+ {
+ /* Port -1: Means UDP IPV4 port binding - Special case
+ * used by DNS engine.
+ */
+ ((sockaddr_in*)server)->sin_family = AF_INET;
+ ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
+ ((sockaddr_in*)server)->sin_port = 0;
+ size = sizeof(sockaddr_in);
+ }
+ else
+ {
+ /* Theres no address here, default to ipv6 bind to all */
+ ((sockaddr_in6*)server)->sin6_family = AF_INET6;
+ memset(&(((sockaddr_in6*)server)->sin6_addr), 0, sizeof(in6_addr));
+ ((sockaddr_in6*)server)->sin6_port = htons(port);
+ size = sizeof(sockaddr_in6);
+ }
}
#else
/* If we aren't built with ipv6, the choice becomes simple */
in_addr addy;
if (inet_pton(AF_INET, addr, &addy) < 1)
{
- delete server;
+ delete[] server;
return false;
}
((sockaddr_in*)server)->sin_addr = addy;
}
/* Bind ipv4 port number */
((sockaddr_in*)server)->sin_port = htons(port);
+ size = sizeof(sockaddr_in);
#endif
- int ret = bind(sockfd, server, sizeof(sockaddr));
-
- delete server;
+ ret = bind(sockfd, server, size);
+ delete[] server;
if (ret < 0)
{
}
else
{
- if (listen(sockfd, Config->MaxConn) == -1)
+ if (dolisten)
{
- this->Log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
- return false;
+ if (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);
+ return true;
+ }
}
else
{
- NonBlocking(sockfd);
+ this->Log(DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
return true;
}
}
}
-
// Open a TCP Socket
-int irc::sockets::OpenTCPSocket()
+int irc::sockets::OpenTCPSocket(char* addr, int socktype)
{
int sockfd;
int on = 1;
struct linger linger = { 0 };
-
- if ((sockfd = socket (AF_FAMILY, SOCK_STREAM, 0)) < 0)
+#ifdef IPV6
+ if (strchr(addr,':') || (!*addr))
+ sockfd = socket (PF_INET6, socktype, 0);
+ else
+ sockfd = socket (PF_INET, socktype, 0);
+ if (sockfd < 0)
+#else
+ if ((sockfd = socket (PF_INET, socktype, 0)) < 0)
+#endif
{
- printf("SOCKET FAIL: %s\n", strerror(errno));
return ERROR;
}
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 */
-bool InspIRCd::HasPort(int port, char* addr)
-{
- for (unsigned long count = 0; count < stats->BoundPortCount; count++)
- {
- if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr)))
- {
- return true;
- }
- }
- return false;
-}
-
/* XXX: Probably belongs in class InspIRCd */
int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports)
{
- Log(DEBUG,"BINDING PORTS");
char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
- insp_sockaddr client, server;
- int clientportcount = 0;
- int BoundPortCount = 0;
+ int bound = 0;
+ bool started_with_nothing = (Config->ports.size() == 0);
+ std::vector<std::pair<std::string, int> > old_ports;
- ports_found = 0;
-
- int InitialPortCount = stats->BoundPortCount;
+ /* 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++)
{
- Log(DEBUG,"FOUND PORT");
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 ((!*Type) || (!strcmp(Type,"clients")))
{
irc::portparser portrange(configToken, false);
- long portno = -1;
+ int portno = -1;
while ((portno = portrange.GetToken()))
{
- if (!HasPort(portno, Addr))
- {
- ports_found++;
- Config->ports[clientportcount+InitialPortCount] = portno;
- if (*Addr == '*')
- *Addr = 0;
+ if (*Addr == '*')
+ *Addr = 0;
- strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256);
- clientportcount++;
- }
- }
- }
-
- if (!bail)
- {
- int PortCount = clientportcount;
- if (PortCount)
- {
- BoundPortCount = stats->BoundPortCount;
- for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++)
+ bool skip = false;
+ for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
{
- int fd = OpenTCPSocket();
- if (fd == ERROR)
+ if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
{
- failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
- Log(DEBUG,"SOCKET FAIL");
- }
- else
- {
- Log(DEBUG,"BIND");
- Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
- if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
+ 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 (!SE->AddFd(Config->openSockfd[BoundPortCount]))
+ if ((k->first == Addr) && (k->second == portno))
{
- this->Log(DEFAULT,"ERK! Failed to add listening port to socket engine!");
- shutdown(Config->openSockfd[BoundPortCount]->GetFd(),2);
- close(Config->openSockfd[BoundPortCount]->GetFd());
- delete Config->openSockfd[BoundPortCount];
- failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
+ old_ports.erase(k);
+ break;
}
- else
- BoundPortCount++;
}
}
}
- return InitialPortCount + BoundPortCount;
+ if (!skip)
+ {
+ ListenSocket* ll = new ListenSocket(this, portno, Addr);
+ if (ll->GetFd() > -1)
+ {
+ bound++;
+ Config->ports.push_back(ll);
+ }
+ else
+ {
+ failed_ports.push_back(std::make_pair(Addr, portno));
+ }
+ ports_found++;
+ }
}
- return InitialPortCount;
}
}
- int PortCount = clientportcount;
-
- for (int count = 0; count < PortCount; count++)
+ /* XXX: Here, anything left in our copy list, close as removed */
+ if (!started_with_nothing)
{
- int fd = OpenTCPSocket();
- if (fd == ERROR)
- {
- Log(DEBUG,"SOCKET FAIL");
- failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
- }
- else
+ for (size_t k = 0; k < old_ports.size(); ++k)
{
- Log(DEBUG,"BIND");
- Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
- if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
+ for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
{
- BoundPortCount++;
+ 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;
+ }
}
- else
- failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
}
}
- return BoundPortCount;
+
+ return bound;
}
const char* irc::sockets::insp_ntoa(insp_inaddr n)
projects / user / henk / code / inspircd.git / blobdiff