* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
sockaddr* ListenSocketBase::client = NULL;
sockaddr* ListenSocketBase::raddr = NULL;
-ListenSocketBase::ListenSocketBase(InspIRCd* Instance, int port, char* addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port)
+ListenSocketBase::ListenSocketBase(InspIRCd* Instance, int port, const std::string &addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port)
{
- this->SetFd(irc::sockets::OpenTCPSocket(addr));
+ this->SetFd(irc::sockets::OpenTCPSocket(addr.c_str()));
if (this->GetFd() > -1)
{
- if (!Instance->BindSocket(this->fd,port,addr))
+ if (!Instance->BindSocket(this->fd,port,addr.c_str()))
this->fd = -1;
#ifdef IPV6
- if ((!*addr) || (strchr(addr,':')))
+ if ((!*addr.c_str()) || (strchr(addr.c_str(),':')))
this->family = AF_INET6;
else
#endif
}
static char buf[MAXBUF];
- static char target[MAXBUF];
+ static char target[MAXBUF];
*target = *buf = '\0';
inet_ntop(AF_INET6, &((const sockaddr_in6*)raddr)->sin6_addr, target, sizeof(target));
else
ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
+
+ /*
+ * This case is the be all and end all patch to catch and nuke 4in6
+ * instead of special-casing shit all over the place and wreaking merry
+ * havoc with crap, instead, we just recreate sockaddr and strip ::ffff: prefix
+ * if it's a 4in6 IP.
+ *
+ * This is, of course, much improved over the older way of handling this
+ * (pretend it doesn't exist + hack around it -- yes, both were done!)
+ *
+ * Big, big thanks to danieldg for his work on this.
+ * -- w00t
+ */
+ static const unsigned char prefix4in6[12] = { 0,0,0,0, 0,0,0,0, 0,0,0xFF,0xFF };
+ if (!memcmp(prefix4in6, &((const sockaddr_in6*)client)->sin6_addr, 12))
+ {
+ // strip leading ::ffff: from the IPs
+ memmove(buf, buf+7, sizeof(buf)-7);
+ memmove(target, target+7, sizeof(target)-7);
+
+ // recreate as a sockaddr_in using the IPv4 IP
+ uint16_t sport = ((const sockaddr_in6*)client)->sin6_port;
+ struct sockaddr_in* clientv4 = (struct sockaddr_in*)client;
+ clientv4->sin_family = AF_INET;
+ clientv4->sin_port = sport;
+ inet_pton(AF_INET, buf, &clientv4->sin_addr);
+ }
}
else
#endif
void ClientListenSocket::OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
{
- ServerInstance->Users->AddUser(ServerInstance, nfd, bind_port, false, this->family, client, ipconnectedto);
+ ServerInstance->Users->AddUser(ServerInstance, nfd, bind_port, false, client, ipconnectedto);
}