#include "iohook.h"
#include "main.h"
-#include "modules/server.h"
#include "utils.h"
#include "treeserver.h"
#include "link.h"
irc::sockets::sockaddrs bind;
memset(&bind, 0, sizeof(bind));
- if ((dest.family() == AF_INET || dest.family() == AF_INET6) && !irc::sockets::aptosa(link->Bind, 0, bind))
+ if (!link->Bind.empty() && (dest.family() == AF_INET || dest.family() == AF_INET6))
{
- state = I_ERROR;
- SetError("Bind address '" + link->Bind + "' is not an valid IPv4 or IPv6 address");
- TreeSocket::OnError(I_ERR_BIND);
- return;
+ if (!irc::sockets::aptosa(link->Bind, 0, bind))
+ {
+ state = I_ERROR;
+ SetError("Bind address '" + link->Bind + "' is not a valid IPv4 or IPv6 address");
+ TreeSocket::OnError(I_ERR_BIND);
+ return;
+ }
+ else if (bind.family() != dest.family())
+ {
+ state = I_ERROR;
+ SetError("Bind address '" + bind.addr() + "' is not the same address family as destination address '" + dest.addr() + "'");
+ TreeSocket::OnError(I_ERR_BIND);
+ return;
+ }
}
DoConnect(dest, bind, link->Timeout);
static_cast<IOHookProvider*>(prov)->OnConnect(this);
}
- ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2[%s] started.", linkID.c_str(),
+ ServerInstance->SNO->WriteGlobalSno('l', "Connection to \002%s\002[%s] started.", linkID.c_str(),
(capab->link->HiddenFromStats ? "<hidden>" : capab->link->IPAddr.c_str()));
this->SendCapabilities(1);
}