]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/dns.cpp
Added ability to update the helpop file on rehash (Bug #69)
[user/henk/code/inspircd.git] / src / dns.cpp
index c3d7cd786a270e769f25a197cb45ddf5c7ea517a..28b131586454d5cf2c2f007813f4c35e60aab347 100644 (file)
@@ -1,5 +1,5 @@
 /*
-dns.cpp - based on the dns library Copyright (C) 2002 Ian Gulliver
+dns.cpp - based on the firedns library Copyright (C) 2002 Ian Gulliver
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of version 2 of the GNU General Public License as
@@ -17,6 +17,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #define _DNS_C
 
+using namespace std;
+
 #include <string>
 #include <stdlib.h>
 #include <time.h>
@@ -29,9 +31,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include "dns.h"
+#include "helperfuncs.h"
 
-static const char tagstring[] = "$Id$";
+extern int statsAccept,statsRefused,statsUnknown,statsCollisions,statsDns,statsDnsGood,statsDnsBad,statsConnects,statsSent,statsRecv;
 
 #define max(a,b) (a > b ? a : b)
 #define DNS_MAX              8                    /* max number of nameservers used */
@@ -95,6 +102,8 @@ struct s_header { /* DNS query header */
        unsigned char payload[512]; /* DNS question, populated by dns_build_query_payload() */
 };
 
+extern time_t TIME;
+
 void *dns_align(void *inp) {
        char *p = (char*)inp;
        int offby = ((char *)p - (char *)0) % DNS_ALIGN;
@@ -161,7 +170,7 @@ void DNS::dns_init() { /* on first call only: populates servers4 struct with up
        i4 = 0;
 
        initdone = 1;
-       srand((unsigned int) time(NULL));
+       srand((unsigned int) TIME);
        memset(servers4,'\0',sizeof(in_addr) * DNS_MAX);
        f = fopen(DNS_CONFIG_FBCK,"r");
        if (f == NULL)
@@ -178,27 +187,21 @@ void DNS::dns_init() { /* on first call only: populates servers4 struct with up
                }
        }
        fclose(f);
-
 }
 
-void DNS::dns_init_2(const char* dnsserver) { /* populates servers4 struct with address from the given parameter */
-        FILE *f;
-        int i;
+void DNS::dns_init_2(const char* dnsserver)
+{
         in_addr addr4;
-        char buf[1024];
-        if (initdone == 1)
-                return;
         i4 = 0;
-
-        initdone = 1;
-        srand((unsigned int) time(NULL));
+        srand((unsigned int) TIME);
         memset(servers4,'\0',sizeof(in_addr) * DNS_MAX);
         if (dns_aton4_s(dnsserver,&addr4) != NULL)
             memcpy(&servers4[i4++],&addr4,sizeof(in_addr));
 }
 
 
-static int dns_send_requests(const s_header *h, const s_connection *s, const int l) { /* send DNS query */
+static int dns_send_requests(const s_header *h, const s_connection *s, const int l)
+{
        int i;
        sockaddr_in addr4;
        unsigned char payload[sizeof(s_header)];
@@ -206,16 +209,16 @@ static int dns_send_requests(const s_header *h, const s_connection *s, const int
        dns_empty_header(payload,h,l);
 
 
-       for (i = 0; i < i4; i++) {
-               /* otherwise send via standard ipv4 boringness */
-               memset(&addr4,0,sizeof(addr4));
-               memcpy(&addr4.sin_addr,&servers4[i],sizeof(addr4.sin_addr));
-               addr4.sin_family = AF_INET;
-               addr4.sin_port = htons(DNS_PORT);
-               if (sendto(s->fd, payload, l + 12, 0, (sockaddr *) &addr4, sizeof(addr4)) == -1)
-               {
-                       return -1;
-               }
+       i = 0;
+
+       /* otherwise send via standard ipv4 boringness */
+       memset(&addr4,0,sizeof(addr4));
+       memcpy(&addr4.sin_addr,&servers4[i],sizeof(addr4.sin_addr));
+       addr4.sin_family = AF_INET;
+       addr4.sin_port = htons(DNS_PORT);
+       if (sendto(s->fd, payload, l + 12, 0, (sockaddr *) &addr4, sizeof(addr4)) == -1)
+       {
+               return -1;
        }
 
        return 0;
@@ -311,7 +314,7 @@ static int dns_build_query_payload(const char * const name, const unsigned short
 }
 
 in_addr* DNS::dns_aton4(const char * const ipstring) { /* ascii to numeric: convert string to static 4part IP addr struct */
-       in_addr ip;
+       static in_addr ip;
        return dns_aton4_s(ipstring,&ip);
 }
 
@@ -326,53 +329,8 @@ in_addr* DNS::dns_aton4_r(const char *ipstring) { /* ascii to numeric (reentrant
 }
 
 in_addr* DNS::dns_aton4_s(const char *ipstring, in_addr *ip) { /* ascii to numeric (buffered): convert string to given 4part IP addr struct */
-       unsigned char *myip;
-       int i,part = 0;
-       myip = (unsigned char *)ip;
-
-       memset(myip,'\0',4);
-       for (i = 0; i < 16; i++) {
-               switch (ipstring[i]) {
-                       case '\0':
-                               if (part != 3)
-                                       return NULL;
-                               return ip;
-                               break;
-                       case '0':
-                       case '1':
-                       case '2':
-                       case '3':
-                       case '4':
-                       case '5':
-                       case '6':
-                       case '7':
-                       case '8':
-                       case '9':
-                               if (myip[part] > 25)
-                                       return NULL;
-                               myip[part] *= 10;
-                               if (myip[part] == 250 && ipstring[i] - '0' > 6)
-                                       return NULL;
-                               myip[part] += ipstring[i] - '0';
-                               break;
-                       case '.':
-                               if (part == 3)
-                                       return ip;
-                               else
-                                       part++;
-                               break;
-                       default:
-                               if (part == 3)
-                                       return ip;
-                               else
-                                       return NULL;
-                               break;
-               }
-       }
-       if (part == 3)
-               return ip;
-       else
-               return NULL;
+       inet_aton(ipstring,ip);
+       return ip;
 }
 
 int DNS::dns_getip4(const char *name) { /* build, add and send A query; retrieve result with dns_getresult() */
@@ -427,8 +385,6 @@ int DNS::dns_getname4(const in_addr *ip) { /* build, add and send PTR query; ret
        unsigned char *c;
        int l;
 
-       dns_init();
-
        c = (unsigned char *)&ip->s_addr;
 
        sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[3],c[2],c[1],c[0]);
@@ -448,39 +404,39 @@ int DNS::dns_getname4(const in_addr *ip) { /* build, add and send PTR query; ret
 }
 
 char* DNS::dns_ntoa4(const in_addr * const ip) { /* numeric to ascii: convert 4part IP addr struct to static string */
-       static char result[256];
-       return dns_ntoa4_s(ip,result);
+       static char r[256];
+       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 *result;
-       result = new char[256];
-       return dns_ntoa4_s(ip,result);
+       char *r;
+       r = new char[256];
+       return dns_ntoa4_s(ip,r);
 }
 
-char* DNS::dns_ntoa4_s(const in_addr *ip, char *result) { /* numeric to ascii (buffered): convert 4part IP addr struct to given string */
+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;
-       sprintf(result,"%d.%d.%d.%d",m[0],m[1],m[2],m[3]);
-       return result;
+       sprintf(r,"%d.%d.%d.%d",m[0],m[1],m[2],m[3]);
+       return r;
 }
 
-char* DNS::dns_getresult(const int fd) { /* retrieve result of DNS query */
-       static char result[RESULTSIZE];
-       return dns_getresult_s(fd,result);
+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 fd) { /* retrieve result of DNS query (reentrant) */
-       char *result;
-       result = new char[RESULTSIZE];
-       if(dns_getresult_s(fd,result) == NULL) {
-               delete result;
+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 result;
+       return r;
 }
 
-char* DNS::dns_getresult_s(const int fd, char *result) { /* retrieve result of DNS query (buffered) */
+char* DNS::dns_getresult_s(const int cfd, char *res) { /* retrieve result of DNS query (buffered) */
        s_header h;
        s_connection *c, *prev;
        int l,i,q,curanswer,o;
@@ -488,15 +444,15 @@ char* DNS::dns_getresult_s(const int fd, char *result) { /* retrieve result of D
        unsigned char buffer[sizeof(s_header)];
        unsigned short p;
 
-       if (result)
+       if (res)
        {
-               result[0] = 0;
+               res[0] = 0;
        }
 
        prev = NULL;
        c = connection_head;
        while (c != NULL) { /* find query in list of open queries */
-               if (c->fd == fd)
+               if (c->fd == cfd)
                        break;
                prev = c;
                c = c->next;
@@ -606,21 +562,21 @@ char* DNS::dns_getresult_s(const int fd, char *result) { /* retrieve result of D
                                        if (h.payload[i] == 0)
                                                q = 1;
                                        else {
-                                               result[o] = '\0';
+                                               res[o] = '\0';
                                                if (o != 0)
-                                                       result[o++] = '.';
-                                               memcpy(&result[o],&h.payload[i + 1],h.payload[i]);
+                                                       res[o++] = '.';
+                                               memcpy(&res[o],&h.payload[i + 1],h.payload[i]);
                                                o += h.payload[i];
                                                i += h.payload[i] + 1;
                                        }
                                }
                        }
-                       result[o] = '\0';
+                       res[o] = '\0';
                        break;
                case DNS_QRY_A:
                        if (c->want_list) {
-                               dns_ip4list *alist = (dns_ip4list *) result; /* we have to trust that this is aligned */
-                               while ((char *)alist - (char *)result < 700) {
+                               dns_ip4list *alist = (dns_ip4list *) res; /* we have to trust that this is aligned */
+                               while ((char *)alist - (char *)res < 700) {
                                        if (rr.type != DNS_QRY_A)
                                                break;
                                        if (rr._class != 1)
@@ -666,12 +622,12 @@ char* DNS::dns_getresult_s(const int fd, char *result) { /* retrieve result of D
                        break;
                default:
                defaultcase:
-                       memcpy(result,&h.payload[i],rr.rdlength);
-                       result[rr.rdlength] = '\0';
+                       memcpy(res,&h.payload[i],rr.rdlength);
+                       res[rr.rdlength] = '\0';
                        break;
        }
        delete c;
-       return result;
+       return res;
 }
 
 DNS::DNS()
@@ -684,19 +640,28 @@ DNS::DNS(std::string dnsserver)
        dns_init_2(dnsserver.c_str());
 }
 
+void DNS::SetNS(std::string dnsserver)
+{
+       dns_init_2(dnsserver.c_str());
+}
+
 DNS::~DNS()
 {
 }
 
 bool DNS::ReverseLookup(std::string ip)
 {
+       statsDns++;
         binip = dns_aton4(ip.c_str());
         if (binip == NULL) {
                 return false;
         }
+
         this->fd = dns_getname4(binip);
        if (this->fd == -1)
+       {
                return false;
+       }
        return true;
 }
 
@@ -722,8 +687,11 @@ std::string DNS::GetResult()
 {
         result = dns_getresult(this->fd);
         if (result) {
+               statsDnsGood++;
+               dns_close(this->fd);
                return result;
         } else {
+               statsDnsBad++;
                return "";
        }
 }