Enhance with new numerics for latest turkish moron detection

[user/henk/code/inspircd.git] / include / dns.h

diff --git a/include/dns.h b/include/dns.h
index d0cb97804c2a8dd659593a59a44739410fa1a4cd..e907c7e2c8855b987f03c54ad9cdfc2b8601ba77 100644 (file)
--- a/include/dns.h
+++ b/include/dns.h
@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #ifndef _DNS_H
 #define _DNS_H
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <string>
+#include "socket.h"
 
 struct dns_ip4list {
        in_addr ip;
@@ -37,9 +35,10 @@ class DNS
 private:
        in_addr *binip;
        char* result;
+       char localbuf[1024];
        int t;
        void dns_init();
-       int fd;
+       int myfd;
        void dns_init_2(const char* dnsserver);
        in_addr *dns_aton4(const char * const ipstring);
        char *dns_ntoa4(const in_addr * const ip);
@@ -64,7 +63,7 @@ public:
        /** This constructor accepts a dns server address. The address must be in dotted
         * decimal form, e.g. 1.2.3.4.
         */
-       DNS(std::string dnsserver);
+       DNS(const std::string &dnsserver);
        /** The destructor frees all used structures.
         */
        ~DNS();
@@ -72,24 +71,38 @@ public:
         * format, e.g. 1.2.3.4, and returns true if the lookup was successfully
         * initiated.
         */
-       bool ReverseLookup(std::string ip);
+       bool ReverseLookup(const std::string &ip);
        /** This method will start the forward lookup of a hostname, e.g. www.inspircd.org,
         * and returns true if the lookup was successfully initiated.
         */
-       bool ForwardLookup(std::string host);
+       bool ForwardLookup(const std::string &host);
+       /** Used by modules to perform a dns lookup but have the socket engine poll a module, instead of the dns object directly.
+        */
+       bool ForwardLookupWithFD(const std::string &host, int &fd);
        /** This method will return true when the lookup is completed. It uses poll internally
         * to determine the status of the socket.
         */
        bool HasResult();
+       /** This method will return true if the lookup's fd matches the one provided
+        */
+       bool HasResult(int fd);
        /** This method returns the result of your query as a string, depending upon wether you
         * called DNS::ReverseLookup() or DNS::ForwardLookup.
         */
        std::string GetResult();
+       std::string GetResultIP();
        /** This method returns the file handle used by the dns query socket or zero if the
         * query is invalid for some reason, e.g. the dns server not responding.
         */
        int GetFD();
-       void SetNS(std::string dnsserver);
+       void SetNS(const std::string &dnsserver);
 };
 
+/** This is the handler function for multi-threaded DNS.
+ * It cannot be a class member as pthread will not let us
+ * create a thread whos handler function is a member of
+ * a class (ugh).
+ */
+void* dns_task(void* arg);
+
 #endif