Remove dnsqueue

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

diff --git a/include/users.h b/include/users.h
index 23f7a7e5db8bb7977bc673df8f9ecb3aea2f7f2e..ea87004859879ad7a550ed1bcaf008497c2b47f2 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -18,17 +18,13 @@
 #define __USERS_H__ 
 
 #include <string>
-
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
-
 #include "inspircd_config.h" 
 #include "socket.h"
 #include "channels.h"
 #include "inspstring.h"
 #include "connection.h"
 #include "hashcomp.h"
+#include "dns.h"
 #include "cull_list.h"
 
 enum ChanStatus {
@@ -52,6 +48,14 @@ enum UserModes {
        UM_OPERATOR = 'o'-65,
 };
 
+enum RegistrationState {
+       REG_NONE = 0,           /* Has sent nothing */
+       REG_USER = 1,           /* Has sent USER */
+       REG_NICK = 2,           /* Has sent NICK */
+       REG_NICKUSER = 3,       /* Bitwise combination of REG_NICK and REG_USER */
+       REG_ALL = 7             /* REG_NICKUSER plus next bit along */
+};
+
 /** Holds a channel name to which a user has been invited.
  */
 class Invited : public classbase
@@ -61,6 +65,24 @@ class Invited : public classbase
 };
 
 
+
+/** Derived from Resolver, and performs user forward/reverse lookups.
+ */
+class UserResolver : public Resolver
+{
+ private:
+       /** User this class is 'attached' to.
+        */
+       userrec* bound_user;
+       int bound_fd;
+ public:
+       UserResolver(userrec* user, std::string to_resolve, bool forward);
+
+       void OnLookupComplete(const std::string &result);
+       void OnError(ResolverError e);
+};
+
+
 /** Holds information relevent to &lt;connect allow&gt; and &lt;connect deny&gt; tags in the config file.
  */
 class ConnectClass : public classbase
@@ -138,6 +160,13 @@ class userrec : public connection
         */
        InvitedList invites;
  public:
+       /** Resolvers for looking up this users hostname
+        */
+       UserResolver* res_forward;
+       UserResolver* res_reverse;
+       std::string stored_host;
+
+       void StartDNSLookup();
        
        /** The users nickname.
         * An invalid nickname indicates an unregistered connection prior to the NICK command.
@@ -238,7 +267,7 @@ class userrec : public connection
 
        /** IPV4 ip address
         */
-       in_addr ip4;
+       insp_inaddr ip4;
 
        /* Write error string
         */
@@ -388,12 +417,6 @@ class userrec : public connection
        /** Default destructor
         */
        virtual ~userrec();
-
-#ifdef THREADED_DNS
-       /** Thread used for threaded lookups
-        */
-       pthread_t dnsthread;
-#endif
 };
 
 /** Used to hold WHOWAS information
@@ -421,7 +444,7 @@ void kill_link(userrec *user,const char* r);
 void kill_link_silent(userrec *user,const char* r);
 void AddWhoWas(userrec* u);
 void MaintainWhoWas(time_t TIME);
-void AddClient(int socket, int port, bool iscached, in_addr ip4);
+void AddClient(int socket, int port, bool iscached, insp_inaddr ip4);
 void FullConnectUser(userrec* user, CullList* Goners);
 userrec* ReHashNick(const char* Old, const char* New);
 void force_nickchange(userrec* user,const char* newnick);