* ---------------------------------------------------
*/
-/* $Core */
-
+#include "inspircd.h"
#include "socket.h"
#include "inspstring.h"
#include "socketengine.h"
-#include "inspircd.h"
bool BufferedSocket::Readable()
{
strlcpy(this->host,ipaddr.c_str(),MAXBUF);
this->port = aport;
- bool ipvalid = true;
-#ifdef IPV6
- if (strchr(host,':'))
- {
- in6_addr n;
- if (inet_pton(AF_INET6, host, &n) < 1)
- ipvalid = false;
- }
- else
-#endif
- {
- in_addr n;
- if (inet_aton(host,&n) < 1)
- ipvalid = false;
- }
- if (!ipvalid)
+ irc::sockets::sockaddrs testaddr;
+ if (!irc::sockets::aptosa(host, aport, &testaddr))
{
this->ServerInstance->Logs->Log("SOCKET", DEBUG,"BUG: Hostname passed to BufferedSocket, rather than an IP address!");
this->OnError(I_ERR_CONNECT);
}
}
-bool BufferedSocket::DoBindMagic(const std::string ¤t_ip, bool v6)
+bool BufferedSocket::DoBindMagic(const std::string ¤t_ip)
{
irc::sockets::sockaddrs s;
- socklen_t size = sizeof(sockaddr_in);
-#ifdef IPV6
- if (v6)
- {
- if (inet_pton(AF_INET6, current_ip.c_str(), &s.in6.sin6_addr) > 0)
- {
- s.in6.sin6_port = 0;
- s.in6.sin6_family = AF_INET6;
- size = sizeof(sockaddr_in6);
- }
- else
- {
- // Well, this is as good as it's gonna get.
- errno = EADDRNOTAVAIL;
- return false;
- }
- }
- else
-#endif
+ if (!irc::sockets::aptosa(current_ip.c_str(), 0, &s))
{
- if (inet_aton(current_ip.c_str(), &s.in4.sin_addr) > 0)
- {
- s.in4.sin_port = 0;
- s.in4.sin_family = AF_INET;
- }
- else
- {
- // Well, this is as good as it's gonna get.
- errno = EADDRNOTAVAIL;
- return false;
- }
+ errno = EADDRNOTAVAIL;
+ return false;
}
- if (ServerInstance->SE->Bind(this->fd, &s.sa, size) < 0)
+ if (ServerInstance->SE->Bind(this->fd, &s.sa, sa_size(s)) < 0)
{
this->state = I_ERROR;
this->OnError(I_ERR_BIND);
bool BufferedSocket::BindAddr(const std::string &ip_to_bind)
{
ConfigReader Conf(this->ServerInstance);
- bool v6 = false;
// Case one: If they provided an IP, try bind it
if (!ip_to_bind.empty())
{
-#ifdef IPV6
- // Check whether or not they are binding to an IPv6 IP..
- if (ip_to_bind.find(':') != std::string::npos)
- v6 = true;
-#endif
// And if it fails, don't do anything.
- return this->DoBindMagic(ip_to_bind, v6);
+ return this->DoBindMagic(ip_to_bind);
}
for (int j = 0; j < Conf.Enumerate("bind"); j++)
// set current IP to the <bind> tag
std::string current_ip = Conf.ReadValue("bind","address",j);
-#ifdef IPV6
- // Check whether this <bind> is for an ipv6 address
- if (current_ip.find(':') != std::string::npos)
- v6 = true;
- else
- v6 = false;
-#endif
-
// Make sure IP is nothing local
if (current_ip == "*" || current_ip == "127.0.0.1" || current_ip.empty() || current_ip == "::1")
continue;
// Try bind, don't fail if it doesn't bind though.
- if (this->DoBindMagic(current_ip, v6))
+ if (this->DoBindMagic(current_ip))
return true;
}