summaryrefslogtreecommitdiff
path: root/src/dns.cpp
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-01 15:08:09 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-09-01 15:08:09 +0000
commit248a14477c435ef28b71df42080ec931b1003e3f (patch)
tree0a774b72a92e2fe3581e75db2173a72151023bbe /src/dns.cpp
parent5ad936b13f317cb277bf03c19e9734d931b1bd00 (diff)
Remove unneeded #ifdef IPV6 lines
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11582 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/dns.cpp')
-rw-r--r--src/dns.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/dns.cpp b/src/dns.cpp
index 396cc56df..5af3fd198 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -217,7 +217,6 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp
DNS::EmptyHeader(payload,header,length);
-#ifdef IPV6
if (this->dnsobj->socketfamily == AF_INET6)
{
sockaddr_in6 addr;
@@ -229,7 +228,6 @@ int DNSRequest::SendRequests(const DNSHeader *header, const int length, QueryTyp
return -1;
}
else
-#endif
{
sockaddr_in addr;
memset(&addr,0,sizeof(addr));
@@ -334,7 +332,6 @@ void DNS::Rehash()
}
this->socketfamily = AF_INET;
-#ifdef IPV6
if (strchr(ServerInstance->Config->DNSServer,':'))
{
this->socketfamily = AF_INET6;
@@ -345,9 +342,6 @@ void DNS::Rehash()
inet_aton(ServerInstance->Config->DNSServer, &this->myserver4);
portpass = -1;
}
-#else
- inet_aton(ServerInstance->Config->DNSServer, &this->myserver4);
-#endif
/* Initialize mastersocket */
int s = irc::sockets::OpenTCPSocket(ServerInstance->Config->DNSServer, SOCK_DGRAM);
@@ -602,7 +596,6 @@ DNSResult DNS::GetResult()
*
* -- Thanks jilles for pointing this one out.
*/
-#ifdef IPV6
char nbuf[MAXBUF];
if (this->socketfamily == AF_INET6)
{
@@ -610,7 +603,6 @@ DNSResult DNS::GetResult()
port_from = ntohs(from.in6.sin6_port);
}
else
-#endif
{
ipaddr_from = inet_ntoa(from.in4.sin_addr);
port_from = ntohs(from.in4.sin_port);