#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
*/
bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
{
- /* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
- sockaddr* servaddr = new sockaddr[2];
- memset(servaddr,0,sizeof(sockaddr)*2);
-
- int ret, size;
+ sockaddrs servaddr;
+ int ret;
if (*addr == '*')
addr = "";
-#ifdef IPV6
if (*addr)
{
- /* There is an address here. Is it ipv6? */
- if (strchr(addr,':'))
- {
- /* Yes it is */
- in6_addr addy;
- if (inet_pton(AF_INET6, addr, &addy) < 1)
- {
- delete[] servaddr;
- return false;
- }
-
- ((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
- memcpy(&(((sockaddr_in6*)servaddr)->sin6_addr), &addy, sizeof(in6_addr));
- ((sockaddr_in6*)servaddr)->sin6_port = htons(port);
- size = sizeof(sockaddr_in6);
- }
- else
- {
- /* No, its not */
- in_addr addy;
- if (inet_pton(AF_INET, addr, &addy) < 1)
- {
- delete[] servaddr;
- return false;
- }
-
- ((sockaddr_in*)servaddr)->sin_family = AF_INET;
- ((sockaddr_in*)servaddr)->sin_addr = addy;
- ((sockaddr_in*)servaddr)->sin_port = htons(port);
- size = sizeof(sockaddr_in);
- }
+ irc::sockets::aptosa(addr, port, &servaddr);
}
else
{
/* Port -1: Means UDP IPV4 port binding - Special case
* used by DNS engine.
*/
- ((sockaddr_in*)servaddr)->sin_family = AF_INET;
- ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
- ((sockaddr_in*)servaddr)->sin_port = 0;
- size = sizeof(sockaddr_in);
+ servaddr.in4.sin_family = AF_INET;
+ servaddr.in4.sin_addr.s_addr = htonl(INADDR_ANY);
+ servaddr.in4.sin_port = 0;
}
else
{
- /* Theres no address here, default to ipv6 bind to all */
- ((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
- memset(&(((sockaddr_in6*)servaddr)->sin6_addr), 0, sizeof(in6_addr));
- ((sockaddr_in6*)servaddr)->sin6_port = htons(port);
- size = sizeof(sockaddr_in6);
- }
- }
+ /* No address */
+#ifdef IPV6
+ /* Default to ipv6 bind to all */
+ servaddr.in6.sin6_family = AF_INET6;
+ servaddr.in6.sin6_port = htons(port);
+ memset(&servaddr.in6.sin6_addr, 0, sizeof(servaddr.in6.sin6_addr));
#else
- /* If we aren't built with ipv6, the choice becomes simple */
- ((sockaddr_in*)servaddr)->sin_family = AF_INET;
- if (*addr)
- {
- /* There is an address here. */
- in_addr addy;
- if (inet_pton(AF_INET, addr, &addy) < 1)
- {
- delete[] servaddr;
- return false;
+ /* Bind ipv4 to all */
+ servaddr.in4.sin_family = AF_INET;
+ servaddr.in4.sin_addr.s_addr = htonl(INADDR_ANY);
+ servaddr.in4.sin_port = htons(port);
+#endif
}
- ((sockaddr_in*)servaddr)->sin_addr = addy;
- }
- else
- {
- /* Bind ipv4 to all */
- ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
}
- /* Bind ipv4 port number */
- ((sockaddr_in*)servaddr)->sin_port = htons(port);
- size = sizeof(sockaddr_in);
-#endif
- ret = SE->Bind(sockfd, servaddr, size);
- delete[] servaddr;
+ ret = SE->Bind(sockfd, &servaddr.sa, sa_size(servaddr));
if (ret < 0)
{
int on = 1;
addr = addr;
struct linger linger = { 0, 0 };
-#ifdef IPV6
if (!*addr)
{
+#ifdef IPV6
sockfd = socket (PF_INET6, socktype, 0);
if (sockfd < 0)
+#endif
sockfd = socket (PF_INET, socktype, 0);
}
else if (strchr(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
{
return ERROR;
}
else
{
- setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
+ setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &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, (char*)&linger,sizeof(linger));
+ setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger));
return (sockfd);
}
}
// XXX: it would be VERY nice to genericize this so all listen stuff (server/client) could use the one function. -- w00t
-int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
+int InspIRCd::BindPorts(FailedPortList &failed_ports)
{
char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
int bound = 0;
- bool started_with_nothing = (Config->ports.size() == 0);
+ bool started_with_nothing = (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<ListenSocketBase *>::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o)
+ for (std::vector<ListenSocketBase *>::iterator o = ports.begin(); o != 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++)
+ for (int count = 0; count < Config->ConfValueEnum("bind"); count++)
{
- 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);
+ Config->ConfValue("bind", "port", count, configToken, MAXBUF);
+ Config->ConfValue("bind", "address", count, Addr, MAXBUF);
+ Config->ConfValue("bind", "type", count, Type, MAXBUF);
if (strncmp(Addr, "::ffff:", 7) == 0)
this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
*Addr = 0;
bool skip = false;
- for (std::vector<ListenSocketBase *>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+ for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
{
if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
{
if (ll->GetFd() > -1)
{
bound++;
- Config->ports.push_back(ll);
+ ports.push_back(ll);
}
else
{
failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno)));
}
- ports_found++;
}
}
}
{
for (size_t k = 0; k < old_ports.size(); ++k)
{
- for (std::vector<ListenSocketBase *>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+ for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
{
if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
{
this->Logs->Log("SOCKET",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);
+ ports.erase(n);
break;
}
}
return bound;
}
-const char* irc::sockets::insp_ntoa(insp_inaddr n)
-{
- static char buf[1024];
- inet_ntop(AF_FAMILY, &n, buf, sizeof(buf));
- return buf;
-}
-
-int irc::sockets::insp_aton(const char* a, insp_inaddr* n)
-{
- return inet_pton(AF_FAMILY, a, n);
-}
-
-int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
+bool irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
{
memset(sa, 0, sizeof(*sa));
if (!addr || !*addr)
return false;
}
-int irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
+bool irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
char addrv[INET6_ADDRSTRLEN+1];
if (sa->sa.sa_family == AF_INET)
{
return false;
}
+int irc::sockets::sa_size(irc::sockets::sockaddrs& sa)
+{
+ if (sa.sa.sa_family == AF_INET)
+ return sizeof(sa.in4);
+ if (sa.sa.sa_family == AF_INET6)
+ return sizeof(sa.in6);
+ return 0;
+}
projects / user / henk / code / inspircd.git / blobdiff