looks like this, walks like this or tastes like this.
*/
+#ifndef WIN32
#include <sys/types.h>
#include <sys/socket.h>
#include <errno.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#else
+#include "inspircd_win32wrapper.h"
+#include "inspircd_se_config.h"
+#endif
+
#include "dns.h"
#include "inspircd.h"
#include "socketengine.h"
#include "configreader.h"
#include "socket.h"
-using irc::sockets::insp_sockaddr;
using irc::sockets::insp_inaddr;
using irc::sockets::insp_ntoa;
using irc::sockets::insp_aton;
sockaddr_in6 addr;
memset(&addr,0,sizeof(addr));
memcpy(&addr.sin6_addr,&dnsobj->myserver6,sizeof(addr.sin6_addr));
- addr.sin6_family = AF_FAMILY;
+ addr.sin6_family = AF_INET6;
addr.sin6_port = htons(DNS::QUERY_PORT);
- if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) == -1)
+ if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
return -1;
}
else
sockaddr_in addr;
memset(&addr,0,sizeof(addr));
memcpy(&addr.sin_addr.s_addr,&dnsobj->myserver4,sizeof(addr.sin_addr));
- addr.sin_family = AF_FAMILY;
+ addr.sin_family = AF_INET;
addr.sin_port = htons(DNS::QUERY_PORT);
- if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) == -1)
+ if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
return -1;
}
#else
sockaddr_in addr;
memset(&addr,0,sizeof(addr));
memcpy(&addr.sin_addr.s_addr, &dnsobj->myserver4, sizeof(addr.sin_addr));
- addr.sin_family = AF_FAMILY;
+ addr.sin_family = AF_INET;
addr.sin_port = htons(DNS::QUERY_PORT);
- if (sendto(dnsobj->GetFd(), payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) == -1)
+ if (sendto(dnsobj->GetFd(), (const char*)payload, length + 12, 0, (sockaddr *) &addr, sizeof(addr)) != length+12)
return -1;
#endif
void DNS::Rehash()
{
ip6munge = false;
+ int portpass = 0;
if (this->GetFd() > -1)
{
if (strchr(ServerInstance->Config->DNSServer,':'))
{
this->socketfamily = AF_INET6;
- inet_pton(AF_INET6, &this->myserver6, ServerInstance->Config->DNSServer);
+ inet_pton(AF_INET6, ServerInstance->Config->DNSServer, &this->myserver6);
}
else
+ {
inet_aton(ServerInstance->Config->DNSServer, &this->myserver4);
+ portpass = -1;
+ }
#else
inet_aton(ServerInstance->Config->DNSServer, &this->myserver4);
#endif
/* Have we got a socket and is it nonblocking? */
if (this->GetFd() != -1)
{
- /* Bind the port */
- if (!ServerInstance->BindSocket(this->GetFd(), 0, ServerInstance->Config->DNSServer, false))
+ /* Bind the port - port 0 INADDR_ANY */
+ if (!ServerInstance->BindSocket(this->GetFd(), portpass, "", false))
{
/* Failed to bind */
shutdown(this->GetFd(),2);
/** Start lookup of an IP address to a hostname */
int DNS::GetNameForce(const char *ip, ForceProtocol fp)
{
- ServerInstance->Log(DEBUG,"GetNameForce: %s", ip);
char query[128];
DNSHeader h;
int id;
in6_addr i;
if (inet_pton(AF_INET6, ip, &i) > 0)
{
- ServerInstance->Log(DEBUG,"Resolve to ipv6");
DNS::MakeIP6Int(query, &i);
}
else
in_addr i;
if (inet_aton(ip, &i))
{
- ServerInstance->Log(DEBUG,"Resolve to ipv4");
unsigned char* c = (unsigned char*)&i.s_addr;
sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[3],c[2],c[1],c[0]);
}
DNSHeader header;
DNSRequest *req;
unsigned char buffer[sizeof(DNSHeader)];
- sockaddr from;
- socklen_t x = sizeof(from);
- const char* ipaddr_from = "";
+ sockaddr* from = new sockaddr[2];
+#ifdef IPV6
+ socklen_t x = this->socketfamily == AF_INET ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
+#else
+ socklen_t x = sizeof(sockaddr_in);
+#endif
+ const char* ipaddr_from;
unsigned short int port_from = 0;
-
- int length = recvfrom(this->GetFd(),buffer,sizeof(DNSHeader),0,&from,&x);
+ int length = _recvfrom(this->GetFd(),(char*)buffer,sizeof(DNSHeader),0,from,&x);
/* Did we get the whole header? */
if (length < 12)
{
/* Nope - something screwed up. */
+ delete[] from;
return DNSResult(-1,"",0,"");
}
* -- Thanks jilles for pointing this one out.
*/
#ifdef IPV6
- ipaddr_from = insp_ntoa(((sockaddr_in6*)&from)->sin6_addr);
- port_from = ntohs(((sockaddr_in6*)&from)->sin6_port);
-#else
- ipaddr_from = insp_ntoa(((sockaddr_in*)&from)->sin_addr);
- port_from = ntohs(((sockaddr_in*)&from)->sin_port);
+ char nbuf[MAXBUF];
+ if (this->socketfamily == AF_INET6)
+ {
+ ipaddr_from = inet_ntop(AF_INET6, &((sockaddr_in6*)from)->sin6_addr, nbuf, sizeof(nbuf));
+ port_from = ntohs(((sockaddr_in6*)from)->sin6_port);
+ }
+ else
#endif
+ {
+ ipaddr_from = inet_ntoa(((sockaddr_in*)from)->sin_addr);
+ port_from = ntohs(((sockaddr_in*)from)->sin_port);
+ }
+
+ delete[] from;
/* We cant perform this security check if you're using 4in6.
* Tough luck to you, choose one or't other!
* as the last parameter on the line with a value ":1".
*/
if (*formatted == ':')
- resultstr = "0" + resultstr;
+ resultstr.insert(0, "0");
}
break;
/** Generate pseudo-random number */
unsigned long DNS::PRNG()
{
+#ifndef WIN32
unsigned long val = 0;
timeval n;
serverstats* s = ServerInstance->stats;
gettimeofday(&n,NULL);
val = (n.tv_usec ^ getpid() ^ geteuid() ^ (this->currid++)) ^ s->statsAccept + n.tv_sec;
val = val + s->statsCollisions ^ s->statsDnsGood - s->statsDnsBad;
- val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv) - s->BoundPortCount;
+ val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv) - ServerInstance->Config->ports.size();
return val;
+#else
+ unsigned long val = 0;
+ serverstats* s = ServerInstance->stats;
+ val = (time(NULL) ^ GetCurrentProcessId() ^ GetCurrentThreadId() ^ (this->currid++)) ^ s->statsAccept + time(NULL);
+ val = val + s->statsCollisions ^ s->statsDnsGood - s->statsDnsBad;
+ val += (s->statsConnects ^ (unsigned long)s->statsSent ^ (unsigned long)s->statsRecv);
+ return val;
+#endif
}