Fixes

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

diff --git a/include/users.h b/include/users.h
index dbe1215ea2d202b04d43a781ad20f3e25bad882a..d64c942801fa6f017fcca5022a8044b95def07ea 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -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
         */
@@ -78,17 +83,17 @@ class ConnectClass : public classbase
        /** Maximum size of recvq for users in this class (bytes)
         */
        long recvqmax;
+
+       /** Local max when connecting by this connection class
+        */
+       long maxlocal;
+
+       /** Global max when connecting by this connection class
+        */
+       long maxglobal;
        
-       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);
        }
 };
 
@@ -188,7 +193,7 @@ class userrec : public connection
         * This is stored even if the <connect> block doesnt need a password, so that
         * modules may check it.
         */
-       char password[MAXBUF];
+       char password[64];
 
        /** User's receive queue.
         * Lines from the IRCd awaiting processing are stored here.
@@ -207,6 +212,10 @@ class userrec : public connection
        time_t reset_due;
        long threshold;
 
+       /** IPV4 ip address
+        */
+       in_addr ip4;
+
        /* Write error string
         */
        std::string WriteError;
@@ -236,23 +245,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.
         */
@@ -316,6 +325,10 @@ class userrec : public connection
         */
        InvitedList* GetInviteList();
 
+       void MakeHost(char* nhost);
+
+       char* MakeWildHost();
+
        /** Shuts down and closes the user's socket
         */
        void CloseSocket();
@@ -341,4 +354,14 @@ 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, int port, bool iscached, in_addr ip4);
+void FullConnectUser(userrec* user, CullList* Goners);
+userrec* ReHashNick(char* Old, char* New);
+void force_nickchange(userrec* user,const char* newnick);
+
 #endif