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 6e5aba1a2e810adf6698719e4f145274fcef3164..43150d16968dace908088ab0590ea5b84f51163e 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -25,6 +25,9 @@
  
 #ifndef __USERS_H__ 
 #define __USERS_H__ 
+
+#include "hashcomp.h"
+#include "cull_list.h"
  
 #define STATUS_OP      4
 #define STATUS_HOP     2
@@ -34,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;
 };
 
 
@@ -59,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
         */
@@ -79,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);
        }
 };
 
@@ -347,7 +344,9 @@ 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);
-void ConnectUser(userrec *user);
+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