* ---------------------------------------------------
*/
+#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,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
- this->family = AF_INET;
-#else
- this->family = AF_INET;
+ 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;
}
}
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 = _accept (this->GetFd(), (sockaddr*)client, &length);
+
+ if ((incomingSockfd > -1) && (!_getsockname(incomingSockfd, 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);
if (ServerInstance->Config->GetIOHook(in_port))
{
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.
#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;
if (inet_pton(AF_INET6, addr, &addy) < 1)
{
- printf("Failed to interpret address %s", addr);
delete[] server;
return false;
}
else
{
/* No, its not */
- printf("Address %s is ipv4\n", addr);
in_addr addy;
if (inet_pton(AF_INET, addr, &addy) < 1)
{
}
else
{
- printf("Address empty port=%d\n", port);
if (port == -1)
{
/* Port -1: Means UDP IPV4 port binding - Special case
* used by DNS engine.
*/
- printf("Special case AF_INET udp bind to all\n");
((sockaddr_in*)server)->sin_family = AF_INET;
((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
((sockaddr_in*)server)->sin_port = 0;
if (ret < 0)
{
- Log(DEBUG,"Bind fails it! %s", strerror(errno));
return false;
}
else
}
else
{
+ this->Log(DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
NonBlocking(sockfd);
return true;
}
}
else
{
+ this->Log(DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
return true;
}
}
int on = 1;
struct linger linger = { 0 };
#ifdef IPV6
- printf("IPV6 ENABLED OPENTCPSOCKET\n");
if (strchr(addr,':') || (!*addr))
- {
- printf("IPV6 OPENTCPSOCKET DO\n");
sockfd = socket (PF_INET6, socktype, 0);
- }
else
- {
- printf("IPV6->IPV4 OPENTCPSOCKET DO\n");
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;
-
- strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256);
- clientportcount++;
- }
- }
- }
+ if (*Addr == '*')
+ *Addr = 0;
- 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(Config->addrs[count]);
- if (fd == ERROR)
- {
- failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
- Log(DEBUG,"SOCKET FAIL");
- }
- else
+ if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
{
- 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(Config->addrs[count]);
- 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