#include "inspircd.h"
-#include "socket.h"
-#include "socketengine.h"
-using irc::sockets::sockaddrs;
-
-/** 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, int port, const char* addr, bool dolisten)
-{
- sockaddrs servaddr;
- int ret;
-
- if ((*addr == '*' || *addr == '\0') && port == -1)
- {
- /* Port -1: Means UDP IPV4 port binding - Special case
- * used by DNS engine.
- */
- memset(&servaddr, 0, sizeof(servaddr));
- servaddr.in4.sin_family = AF_INET;
- }
- else if (!irc::sockets::aptosa(addr, port, servaddr))
- return false;
-
- ret = SE->Bind(sockfd, servaddr);
-
- if (ret < 0)
- {
- return false;
- }
- else
- {
- if (dolisten)
- {
- if (SE->Listen(sockfd, Config->MaxConn) == -1)
- {
- this->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR in listen(): %s",strerror(errno));
- return false;
- }
- else
- {
- this->Logs->Log("SOCKET", LOG_DEBUG, "New socket binding for %d with listen: %s:%d", sockfd, addr, port);
- SE->NonBlocking(sockfd);
- return true;
- }
- }
- else
- {
- this->Logs->Log("SOCKET", LOG_DEBUG, "New socket binding for %d without listen: %s:%d", sockfd, addr, port);
- return true;
- }
- }
-}
int InspIRCd::BindPorts(FailedPortList &failed_ports)
{
irc::sockets::sockaddrs bindspec;
if (!irc::sockets::aptosa(Addr, portno, bindspec))
continue;
- std::string bind_readable = bindspec.str();
bool skip = false;
for (std::vector<ListenSocket*>::iterator n = old_ports.begin(); n != old_ports.end(); ++n)
{
- if ((**n).bind_desc == bind_readable)
+ if ((**n).bind_sa == bindspec)
{
(*n)->bind_tag = tag; // Replace tag, we know addr and port match, but other info (type, ssl) may not
+ (*n)->ResetIOHookProvider();
+
skip = true;
old_ports.erase(n);
break;
}
else
{
- failed_ports.push_back(std::make_pair(bind_readable, strerror(errno)));
+ failed_ports.push_back(std::make_pair(bindspec, errno));
delete ll;
}
}
}
this->Logs->Log("SOCKET", LOG_DEFAULT, "Port binding %s was removed from the config file, closing.",
- (**n).bind_desc.c_str());
+ (**n).bind_sa.str().c_str());
delete *n;
// this keeps the iterator valid, pointing to the next element
char addrv[INET6_ADDRSTRLEN+1];
if (sa.sa_family == AF_INET)
{
- if (!inet_ntop(AF_INET, &in4.sin_addr, addrv, sizeof(addrv)))
+ if (!inet_ntop(AF_INET, (void*)&in4.sin_addr, addrv, sizeof(addrv)))
return "";
return addrv;
}
else if (sa.sa_family == AF_INET6)
{
- if (!inet_ntop(AF_INET6, &in6.sin6_addr, addrv, sizeof(addrv)))
+ if (!inet_ntop(AF_INET6, (void*)&in6.sin6_addr, addrv, sizeof(addrv)))
return "";
return addrv;
}
return "";
}
-bool irc::sockets::satoap(const irc::sockets::sockaddrs& sa, std::string& addr, int &port)
-{
- port = sa.port();
- addr = sa.addr();
- return !addr.empty();
-}
-
-static const char all_zero[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 };
-
std::string irc::sockets::sockaddrs::str() const
{
if (sa.sa_family == AF_INET)
{
char ipaddr[INET_ADDRSTRLEN];
- inet_ntop(AF_INET, &in4.sin_addr, ipaddr, sizeof(ipaddr));
+ inet_ntop(AF_INET, (void*)&in4.sin_addr, ipaddr, sizeof(ipaddr));
return InspIRCd::Format("%s:%u", ipaddr, ntohs(in4.sin_port));
}
if (sa.sa_family == AF_INET6)
{
char ipaddr[INET6_ADDRSTRLEN];
- inet_ntop(AF_INET6, &in6.sin6_addr, ipaddr, sizeof(ipaddr));
+ inet_ntop(AF_INET6, (void*)&in6.sin6_addr, ipaddr, sizeof(ipaddr));
return InspIRCd::Format("[%s]:%u", ipaddr, ntohs(in6.sin6_port));
}
return "<unknown>";
}
-int irc::sockets::sockaddrs::sa_size() const
+socklen_t irc::sockets::sockaddrs::sa_size() const
{
if (sa.sa_family == AF_INET)
return sizeof(in4);
return !memcmp(this, &other, sizeof(*this));
}
-static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, int range)
+static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, unsigned char range)
{
const unsigned char* base;
unsigned char target_byte;
}
}
-irc::sockets::cidr_mask::cidr_mask(const irc::sockets::sockaddrs& sa, int range)
+irc::sockets::cidr_mask::cidr_mask(const irc::sockets::sockaddrs& sa, unsigned char range)
{
sa2cidr(*this, sa, range);
}
irc::sockets::sockaddrs sa;
sa.sa.sa_family = type;
unsigned char* base;
- int len;
+ size_t len;
if (type == AF_INET)
{
base = (unsigned char*)&sa.in4.sin_addr;
irc::sockets::cidr_mask tmp(addr, length);
return tmp == *this;
}
-