#include <netinet/in.h>
#include <arpa/inet.h>
#include "dns.h"
+#include "inspircd.h"
#include "helperfuncs.h"
+#include "socketengine.h"
-extern int statsAccept,statsRefused,statsUnknown,statsCollisions,statsDns,statsDnsGood,statsDnsBad,statsConnects,statsSent,statsRecv;
+extern InspIRCd* ServerInstance;
+extern ServerConfig* Config;
#define max(a,b) (a > b ? a : b)
#define DNS_MAX 8 /* max number of nameservers used */
}
void dns_close(int fd) { /* close query */
+ log(DEBUG,"DNS: dns_close on fd %d",fd);
if (fd == lastcreate) {
wantclose = 1;
return;
return dns_ntoa4_s(ip,r);
}
-char* DNS::dns_ntoa4_r(const in_addr *ip) { /* numeric to ascii (reentrant): convert 4part IP addr struct to new string */
- char *r;
- r = new char[256];
- return dns_ntoa4_s(ip,r);
-}
-
char* DNS::dns_ntoa4_s(const in_addr *ip, char *r) { /* numeric to ascii (buffered): convert 4part IP addr struct to given string */
unsigned char *m;
m = (unsigned char *)&ip->s_addr;
}
char* DNS::dns_getresult(const int cfd) { /* retrieve result of DNS query */
- static char r[RESULTSIZE];
- return dns_getresult_s(cfd,r);
-}
-
-char* DNS::dns_getresult_r(const int cfd) { /* retrieve result of DNS query (reentrant) */
- char *r;
- r = new char[RESULTSIZE];
- if(dns_getresult_s(cfd,r) == NULL) {
- delete r;
- return NULL;
- }
- return r;
+ log(DEBUG,"DNS: dns_getresult with cfd=%d",cfd);
+ return dns_getresult_s(cfd,this->localbuf);
}
char* DNS::dns_getresult_s(const int cfd, char *res) { /* retrieve result of DNS query (buffered) */
c = c->next;
}
if (c == NULL) {
- log(DEBUG,"DNS: got a response for a query we didnt send");
+ log(DEBUG,"DNS: got a response for a query we didnt send with fd=%d",cfd);
return NULL; /* query not found */
}
/* query found-- pull from list: */
return NULL;
}
if ((h.flags2 & FLAGS2_MASK_RCODE) != 0) {
- log(DEBUG,"DNS: got an RCODE and didnt want one");
+ log(DEBUG,"DNS lookup failed due to SERVFAIL");
delete c;
return NULL;
}
DNS::DNS()
{
dns_init();
+ log(DEBUG,"Create blank DNS");
}
DNS::DNS(std::string dnsserver)
{
dns_init_2(dnsserver.c_str());
+ log(DEBUG,"Create DNS");
}
void DNS::SetNS(std::string dnsserver)
{
dns_init_2(dnsserver.c_str());
+ log(DEBUG,"Set NS");
}
DNS::~DNS()
bool DNS::ReverseLookup(std::string ip)
{
- statsDns++;
+ ServerInstance->stats->statsDns++;
binip = dns_aton4(ip.c_str());
if (binip == NULL) {
return false;
}
- this->fd = dns_getname4(binip);
- if (this->fd == -1)
+ this->myfd = dns_getname4(binip);
+ if (this->myfd == -1)
{
return false;
}
+ log(DEBUG,"DNS: ReverseLookup, fd=%d",this->myfd);
+#ifndef THREADED_DNS
+ ServerInstance->SE->AddFd(this->myfd,true,X_ESTAB_DNS);
+#endif
return true;
}
bool DNS::ForwardLookup(std::string host)
{
- statsDns++;
- this->fd = dns_getip4(host.c_str());
- if (this->fd == -1)
+ ServerInstance->stats->statsDns++;
+ this->myfd = dns_getip4(host.c_str());
+ if (this->myfd == -1)
{
return false;
}
+ log(DEBUG,"DNS: ForwardLookup, fd=%d",this->myfd);
+#ifndef THREADED_DNS
+ ServerInstance->SE->AddFd(this->myfd,true,X_ESTAB_DNS);
+#endif
return true;
}
+bool DNS::HasResult(int fd)
+{
+ return (fd == this->myfd);
+}
+
+/* Only the multithreaded dns uses this poll() based
+ * check now. As its in another thread we dont have
+ * to worry about its performance that much.
+ */
bool DNS::HasResult()
{
+ log(DEBUG,"DNS: HasResult, fd=%d",this->myfd);
pollfd polls;
- polls.fd = this->fd;
+ polls.fd = this->myfd;
polls.events = POLLIN;
int ret = poll(&polls,1,1);
+ log(DEBUG,"DNS: Hasresult returning %d",ret);
return (ret > 0);
}
int DNS::GetFD()
{
- return this->fd;
+ return this->myfd;
}
std::string DNS::GetResult()
{
- result = dns_getresult(this->fd);
+ log(DEBUG,"DNS: GetResult()");
+ result = dns_getresult(this->myfd);
+#ifndef THREADED_DNS
+ ServerInstance->SE->DelFd(this->myfd);
+#endif
if (result) {
- statsDnsGood++;
- dns_close(this->fd);
+ ServerInstance->stats->statsDnsGood++;
+ dns_close(this->myfd);
return result;
} else {
- statsDnsBad++;
- if (this->fd != -1)
+ ServerInstance->stats->statsDnsBad++;
+ if (this->myfd != -1)
{
- dns_close(this->fd);
+ dns_close(this->myfd);
}
return "";
}
std::string DNS::GetResultIP()
{
char r[1024];
- result = dns_getresult(this->fd);
- if (this->fd != -1)
+ log(DEBUG,"DNS: GetResultIP()");
+ result = dns_getresult(this->myfd);
+ if (this->myfd != -1)
{
- dns_close(this->fd);
+#ifndef THREADED_DNS
+ ServerInstance->SE->DelFd(this->myfd);
+#endif
+ dns_close(this->myfd);
}
if (result)
{
- statsDnsGood++;
+ ServerInstance->stats->statsDnsGood++;
unsigned char a = (unsigned)result[0];
unsigned char b = (unsigned)result[1];
unsigned char c = (unsigned)result[2];
}
else
{
- statsDnsBad++;
+ ServerInstance->stats->statsDnsBad++;
log(DEBUG,"DANGER WILL ROBINSON! NXDOMAIN for forward lookup, but we got a reverse lookup!");
return "";
}
}
+
+
+
+#ifdef THREADED_DNS
+void* dns_task(void* arg)
+{
+ userrec* u = (userrec*)arg;
+ log(DEBUG,"DNS thread for user %s",u->nick);
+ DNS dns1;
+ DNS dns2;
+ std::string host;
+ std::string ip;
+ if (dns1.ReverseLookup(u->ip))
+ {
+ while (!dns1.HasResult())
+ {
+ usleep(100);
+ }
+ host = dns1.GetResult();
+ if (host != "")
+ {
+ if (dns2.ForwardLookup(host))
+ {
+ while (!dns2.HasResult())
+ {
+ usleep(100);
+ }
+ ip = dns2.GetResultIP();
+ if (ip == std::string(u->ip))
+ {
+ if (host.length() < 160)
+ {
+ strcpy(u->host,host.c_str());
+ strcpy(u->dhost,host.c_str());
+ }
+ }
+ }
+ }
+ }
+ u->dns_done = true;
+ return NULL;
+}
+#endif
projects / user / henk / code / inspircd.git / blobdiff