Changed from std::map to hash_map

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

diff --git a/include/users.h b/include/users.h
index 69ea434fb5adb646524f709dd0010a01bde123e6..43150d16968dace908088ab0590ea5b84f51163e 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -16,12 +16,18 @@
 
 #include "inspircd_config.h" 
 #include "channels.h"
-#include "connection.h"
 #include "inspstring.h"
+#include "connection.h"
 #include <string>
+#ifdef THREADED_DNS
+#include <pthread.h>
+#endif
  
 #ifndef __USERS_H__ 
 #define __USERS_H__ 
+
+#include "hashcomp.h"
+#include "cull_list.h"
  
 #define STATUS_OP      4
 #define STATUS_HOP     2
@@ -31,12 +37,14 @@
 #define CC_ALLOW       0
 #define CC_DENY                1
 
+template<typename T> inline string ConvToStr(const T &in);
+
 /** Holds a channel name to which a user has been invited.
  */
 class Invited : public classbase
 {
  public:
-       char channel[CHANMAX];
+        irc::string channel;
 };
 
 
@@ -56,13 +64,13 @@ class ConnectClass : public classbase
        int flood;
        /** Host mask for this line
         */
-       char host[MAXBUF];
+       std::string host;
        /** Number of seconds between pings for this line
         */
        int pingtime;
        /** (Optional) Password for this line
         */
-       char pass[MAXBUF];
+       std::string pass;
 
        /** Threshold value for flood disconnect
         */
@@ -76,16 +84,8 @@ class ConnectClass : public classbase
         */
        long recvqmax;
        
-       ConnectClass()
+       ConnectClass() : registration_timeout(0), flood(0), host(""), pingtime(0), pass(""), threshold(0), sendqmax(0), recvqmax(0)
        {
-               registration_timeout = 0;
-               flood = 0;
-               pingtime = 0;
-               threshold = 0;
-               sendqmax = 0;
-               recvqmax = 0;
-               strlcpy(host,"",MAXBUF);
-               strlcpy(pass,"",MAXBUF);
        }
 };
 
@@ -143,7 +143,7 @@ class userrec : public connection
         */
        char modes[54];
        
-       ucrec chans[MAXCHANS];
+       std::vector<ucrec> chans;
        
        /** The server the user is connected to.
         */
@@ -218,8 +218,6 @@ class userrec : public connection
 
        userrec();
        
-       virtual ~userrec() {  }
-       
        /** Returns the full displayed host of the user
         * This member function returns the hostname of the user as seen by other users
         * on the server, in nick!ident&at;host form.
@@ -235,23 +233,23 @@ class userrec : public connection
        
        /** Returns true if a user is invited to a channel.
         */
-       virtual bool IsInvited(char* channel);
+       virtual bool IsInvited(irc::string &channel);
        
        /** Adds a channel to a users invite list (invites them to a channel)
         */
-       virtual void InviteTo(char* channel);
+       virtual void InviteTo(irc::string &channel);
        
        /** Removes a channel from a users invite list.
         * This member function is called on successfully joining an invite only channel
         * to which the user has previously been invited, to clear the invitation.
         */
-       virtual void RemoveInvite(char* channel);
+       virtual void RemoveInvite(irc::string &channel);
        
        /** Returns true or false for if a user can execute a privilaged oper command.
         * This is done by looking up their oper type from userrec::oper, then referencing
         * this to their oper classes and checking the commands they can execute.
         */
-       bool HasPermission(char* command);
+       bool HasPermission(std::string &command);
 
        /** Calls read() to read some data for this user using their fd.
         */
@@ -318,6 +316,12 @@ class userrec : public connection
        /** Shuts down and closes the user's socket
         */
        void CloseSocket();
+
+       virtual ~userrec();
+
+#ifdef THREADED_DNS
+       pthread_t dnsthread;
+#endif
 };
 
 /** A lightweight userrec used by WHOWAS
@@ -334,4 +338,15 @@ class WhoWasUser
        time_t signon;
 };
 
+void AddOper(userrec* user);
+void DeleteOper(userrec* user);
+void kill_link(userrec *user,const char* r);
+void kill_link_silent(userrec *user,const char* r);
+void AddWhoWas(userrec* u);
+void AddClient(int socket, char* host, int port, bool iscached, char* ip);
+void FullConnectUser(userrec* user, CullList* Goners);
+//void ConnectUser(userrec *user, CullList* Goners);
+userrec* ReHashNick(char* Old, char* New);
+void force_nickchange(userrec* user,const char* newnick);
+
 #endif