Various changes to support authname being stored inside the authext.

[irc/quakenet/newserv.git] / nick / nick.h

diff --git a/nick/nick.h b/nick/nick.h
index 2de268b758fdcf25f1272266486c19132c96b950..c24c0089f087021267512d7a4d8264eccd63ac99 100644 (file)
--- a/nick/nick.h
+++ b/nick/nick.h
@@ -9,10 +9,16 @@
 #include "../lib/array.h"
 #include "../server/server.h"
 #include "../lib/base64.h"
+#include "../lib/irc_ipv6.h"
+#include "../patricia/patricia.h"
+
+#include "../authext/authext.h"
+
 #include <time.h>
 
-#define MAXNICKEXTS       5
-#define MAXAUTHNAMEEXTS   5
+#ifndef MAXNICKEXTS
+#define MAXNICKEXTS       6
+#endif
 
 #define UMODE_INV       0x0001
 #define UMODE_WALLOPS   0x0002
@@ -27,8 +33,17 @@
 #define UMODE_SETHOST   0x0400
 #define UMODE_REGPRIV   0x0800
 #define UMODE_HIDEIDLE  0x1000
+#define UMODE_PARANOID  0x2000
 
-#define UMODE_ALL       0x1FFF
+#define UMODE_ALL       0x3FFF
+
+#define AFLAG_STAFF     0x0001
+#define AFLAG_SUPPORT   0x0002
+#define AFLAG_OPER      0x0004
+#define AFLAG_ADMIN     0x0008
+#define AFLAG_DEVELOPER 0x0010
+
+#define AFLAG_ALL       0x001F
 
 #define IsInvisible(x)    ((x)->umodes & UMODE_INV)
 #define IsWallops(x)      ((x)->umodes & UMODE_WALLOPS)
@@ -43,6 +58,7 @@
 #define IsSetHost(x)      ((x)->umodes & UMODE_SETHOST)
 #define IsRegPriv(x)      ((x)->umodes & UMODE_REGPRIV)
 #define IsHideIdle(x)     ((x)->umodes & UMODE_HIDEIDLE)
+#define IsParanoid(x)     ((x)->umodes & UMODE_PARANOID)
 
 #define SetInvisible(x)    ((x)->umodes |= UMODE_INV)
 #define SetWallops(x)      ((x)->umodes |= UMODE_WALLOPS)
@@ -57,6 +73,7 @@
 #define SetSetHost(x)      ((x)->umodes |= UMODE_SETHOST)
 #define SetRegPriv(x)      ((x)->umodes |= UMODE_REGPRIV)
 #define SetHideIdle(x)     ((x)->umodes |= UMODE_HIDEIDLE)
+#define SetParanoid(x)     ((x)->umodes |= UMODE_PARANOID)
 
 #define ClearInvisible(x)    ((x)->umodes &= ~UMODE_INV)
 #define ClearWallops(x)      ((x)->umodes &= ~UMODE_WALLOPS)
@@ -71,6 +88,25 @@
 #define ClearSetHost(x)      ((x)->umodes &= ~UMODE_SETHOST)
 #define ClearRegPriv(x)      ((x)->umodes &= ~UMODE_REGPRIV)
 #define ClearHideIdle(x)     ((x)->umodes &= ~UMODE_HIDEIDLE)
+#define ClearParanoid(x)     ((x)->umodes &= ~UMODE_PARANOID)
+
+#define IsStaff(x)           ((x)->flags & AFLAG_STAFF)
+#define IsDeveloper(x)       ((x)->flags & AFLAG_DEVELOPER)
+#define IsSupport(x)         ((x)->flags & AFLAG_SUPPORT)
+#define IsAdmin(x)           ((x)->flags & AFLAG_ADMIN)
+#define IsOperFlag(x)        ((x)->flags & AFLAG_OPER)
+
+#define SetStaff(x)          ((x)->flags |= AFLAG_STAFF)
+#define SetDeveloper(x)      ((x)->flags |= AFLAG_DEVELOPER)
+#define SetSupport(x)        ((x)->flags |= AFLAG_SUPPORT)
+#define SetAdmin(x)          ((x)->flags |= AFLAG_ADMIN)
+#define SetOperFlag(x)       ((x)->flags |= AFLAG_OPER)
+
+#define ClearStaff(x)        ((x)->flags &= ~AFLAG_STAFF)
+#define ClearDeveloper(x)    ((x)->flags &= ~AFLAG_DEVELOPER)
+#define ClearSupport(x)      ((x)->flags &= ~AFLAG_SUPPORT)
+#define ClearAdmin(x)        ((x)->flags &= ~AFLAG_ADMIN)
+#define ClearOperFlag(x)     ((x)->flags &= ~AFLAG_OPER)
 
 typedef struct host {
   sstring *name;
@@ -88,16 +124,6 @@ typedef struct realname {
   struct realname *next;
 } realname;
 
-typedef struct authname {
-  unsigned long userid;
-  int usercount;
-  unsigned int marker;
-  struct nick *nicks;
-  struct authname *next;
-  /* These are extensions only used by other modules */
-  void *exts[MAXAUTHNAMEEXTS];
-} authname;
-
 typedef struct nick {
   char nick[NICKLEN+1];
   long numeric;
@@ -106,12 +132,13 @@ typedef struct nick {
   realname *realname;
   sstring *shident;  /* +h users: fake ident/host goes here */
   sstring *sethost;
+  sstring *opername;
   flag_t umodes;
-  char authname[ACCOUNTLEN+1];
+  char *authname;
   authname *auth; /* This requires User ID numbers to work */
   time_t timestamp;
   time_t accountts;
-  unsigned long ipaddress;  
+  patricia_node_t *ipnode;
   unsigned int marker;
   struct nick *next;
   struct nick *nextbyhost;
@@ -122,17 +149,18 @@ typedef struct nick {
   void *exts[MAXNICKEXTS];
 } nick;
 
+#define p_ipaddr ipnode->prefix->sin
+
 #define NICKHASHSIZE      60000
 #define HOSTHASHSIZE      40000
 #define REALNAMEHASHSIZE  40000
-#define AUTHNAMEHASHSIZE  60000
 
 extern nick *nicktable[NICKHASHSIZE];
 extern nick **servernicks[MAXSERVERS];
 extern host *hosttable[HOSTHASHSIZE];
 extern realname *realnametable[REALNAMEHASHSIZE];
-extern authname *authnametable[AUTHNAMEHASHSIZE];
 extern const flag umodeflags[];
+extern const flag accountflags[];
 
 #define MAXNUMERIC 0x3FFFFFFF
 
@@ -154,8 +182,6 @@ nick *newnick();
 void freenick (nick *np);
 host *newhost();
 void freehost (host *hp);
-authname *newauthname();
-void freeauthname (authname *hp);
 
 /* nick.c functions */
 void handleserverchange(int hooknum, void *arg);
@@ -166,10 +192,8 @@ nick *getnickbynick(const char *nick);
 int registernickext(const char *name);
 int findnickext(const char *name);
 void releasenickext(int index);
-int registerauthnameext(const char *name);
-int findauthnameext(const char *name);
-void releaseauthnameext(int index);
 char *visiblehostmask(nick *np, char *buf);
+char *visibleuserhost(nick *np, char *buf);
 
 /* nickhandlers.c functions */
 int handlenickmsg(void *source, int cargc, char **cargv);
@@ -179,6 +203,7 @@ int handleusermodemsg(void *source, int cargc, char **cargv);
 int handlewhoismsg(void *source, int cargc, char **cargv);
 int handleaccountmsg(void *source, int cargc, char **cargv);
 int handlestatsmsg(void *source, int cargc, char **cargv);
+int handleprivmsg(void *source, int cargc, char **cargv);
 
 /* These functions have been replaced by macros 
 nick **gethandlebynumeric(long numeric);
@@ -188,19 +213,16 @@ nick *getnickbynumericstr(char *numericstr);
                     
 /* nickhelpers.c functions */
 void initnickhelpers();
+void fininickhelpers();
 host *findhost(const char *hostname);
 host *findorcreatehost(const char *hostname);
 void releasehost(host *hp);
 realname *findrealname(const char *name);
 realname *findorcreaterealname(const char *name);
 void releaserealname(realname *rnp);
-authname *findauthname(unsigned long userid);
-authname *findorcreateauthname(unsigned long userid);
-void releaseauthname(authname *anp);
 
 unsigned int nexthostmarker();
 unsigned int nextrealnamemarker();
-unsigned int nextauthnamemarker();
 unsigned int nextnickmarker();
 
 #endif