patricia trie changes

[irc/quakenet/newserv.git] / localuser / localuser.c

diff --git a/localuser/localuser.c b/localuser/localuser.c
index 43d87502927fe458468376a3f028d50c558e7983..94062d0429a2e2d174d4f313e4ef0fe0807e7e01 100644 (file)
--- a/localuser/localuser.c
+++ b/localuser/localuser.c
@@ -67,11 +67,11 @@ void _fini() {
 }
 
 /*
- * registerlocaluserwithuserid:
+ * registerlocaluserwithuseridflags:
  *  This function creates a local user, and broadcasts it's existence to the net (if connected).
  */
 
-nick *registerlocaluserwithuserid(char *nickname, char *ident, char *host, char *realname, char *authname, unsigned long authid, flag_t umodes, UserMessageHandler handler) {
+nick *registerlocaluserwithuseridflags(char *nickname, char *ident, char *host, char *realname, char *authname, unsigned long authid, flag_t umodes, flag_t accountflags, UserMessageHandler handler) {
   int i;  
   nick *newuser,*np; 
   struct irc_in_addr ipaddress;
@@ -100,14 +100,17 @@ nick *registerlocaluserwithuserid(char *nickname, char *ident, char *host, char
   newuser->nextbyrealname=newuser->realname->nicks;
   newuser->realname->nicks=newuser;
   newuser->umodes=umodes;
+  newuser->accountflags=accountflags;
   
   memset(&ipaddress, 0, sizeof(ipaddress));
-  ((unsigned short *)(ipaddress.in6_16))[5] = 0;
+  ((unsigned short *)(ipaddress.in6_16))[5] = 65535;
   ((unsigned short *)(ipaddress.in6_16))[6] = 127;
   ((unsigned char *)(ipaddress.in6_16))[14] = 1;
   ((unsigned char *)(ipaddress.in6_16))[15] = (currentlocalunum%253)+1;
 
   newuser->ipnode = refnode(iptree, &ipaddress, PATRICIA_MAXBITS);
+  node_increment_usercount(newuser->ipnode);
+
   newuser->timestamp=getnettime();
   newuser->shident=NULL;
   newuser->sethost=NULL;
@@ -203,8 +206,9 @@ int renamelocaluser(nick *np, char *newnick) {
  */
  
 int deregisterlocaluser(nick *np, char *reason) {
-  int defaultreason=0;
   long numeric;
+  char reasonstr[512];
+  void *harg[2];
   
   if (np==NULL || (homeserver(np->numeric)!=mylongnum)) {
     /* Non-existent user, or user not on this server */
@@ -212,14 +216,21 @@ int deregisterlocaluser(nick *np, char *reason) {
   }
   
   if (reason==NULL || *reason=='\0') {
-    defaultreason=1;
+    sprintf(reasonstr,"Quit");
+  } else {
+    snprintf(reasonstr,510,"Quit: %s",reason);
   }
   
+  harg[0]=np;
+  harg[1]=reasonstr;
+  
+  triggerhook(HOOK_NICK_QUIT, harg);
+  
   numeric=np->numeric;
   umhandlers[np->numeric&MAXLOCALUSER]=NULL;
   deletenick(np);
   if (connected) {
-    irc_send("%s Q :Quit: %s",longtonumeric(numeric,5),(defaultreason?"Leaving":reason));
+    irc_send("%s Q :%s",longtonumeric(numeric,5),reasonstr);
   }
 
   return 0;
@@ -254,11 +265,16 @@ void sendnickmsg(nick *np) {
   numericbuf[5]='\0';
   
   if (IsAccount(np)) {
-    if (np->auth) {
-      irc_send("%s N %s 1 %ld %s %s %s %s:%ld:%lu %s %s :%s",
+    if(np->accountflags) {
+      irc_send("%s N %s 1 %ld %s %s %s %s:%ld:%lu:" FLAG_T_SPECIFIER " %s %s :%s",
         mynumeric->content,np->nick,np->timestamp,np->ident,np->host->name->content,
-        printflags(np->umodes,umodeflags),np->authname,np->accountts,np->auth->userid,
+        printflags(np->umodes,umodeflags),np->authname,np->accountts,np->auth?np->auth->userid:0,np->accountflags,
         iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),numericbuf,np->realname->name->content);
+    } else if (np->auth) {
+        irc_send("%s N %s 1 %ld %s %s %s %s:%ld:%lu %s %s :%s",
+          mynumeric->content,np->nick,np->timestamp,np->ident,np->host->name->content,
+          printflags(np->umodes,umodeflags),np->authname,np->accountts,np->auth->userid,
+          iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),numericbuf,np->realname->name->content);
     } else if (np->accountts) {
       irc_send("%s N %s 1 %ld %s %s %s %s:%ld %s %s :%s",
         mynumeric->content,np->nick,np->timestamp,np->ident,np->host->name->content,
@@ -469,7 +485,7 @@ void killuser(nick *source, nick *target, char *format, ... ) {
       if (pk->target == target)
         return;
 
-    Error("localuser", ERR_INFO, "Adding pending kill for %s", target->nick);
+    Error("localuser", ERR_DEBUG, "Adding pending kill for %s", target->nick);
     pk = (pendingkill *)malloc(sizeof(pendingkill));
     pk->source = source;
     pk->target = target;
@@ -481,6 +497,10 @@ void killuser(nick *source, nick *target, char *format, ... ) {
   }
 }
 
+void sethostuser(nick *target, char *ident, char *host) {
+  irc_send("%s SH %s %s %s", mynumeric->content, longtonumeric(target->numeric, 5), ident, host);
+}
+
 void _killuser(nick *source, nick *target, char *reason) {
   char senderstr[6];
   char sourcestring[HOSTLEN+NICKLEN+3];
@@ -506,7 +526,7 @@ void clearpendingkills(int hooknum, void *arg) {
     pendingkilllist = pk->next;
 
     if (pk->target) {
-      Error("localuser", ERR_INFO, "Processing pending kill for %s", pk->target->nick);
+      Error("localuser", ERR_DEBUG, "Processing pending kill for %s", pk->target->nick);
       _killuser(pk->source, pk->target, pk->reason->content);
     }
 
@@ -533,7 +553,7 @@ void checkpendingkills(int hooknum, void *arg) {
 }
 
 /* Auth user */
-void localusersetaccountwithuserid(nick *np, char *accname, unsigned long accid) {
+void localusersetaccountwithuseridflagsts(nick *np, char *accname, unsigned long accid, flag_t accountflags, time_t authTS) {
   if (IsAccount(np)) {
     Error("localuser",ERR_WARNING,"Tried to set account on user %s already authed", np->nick);
     return;
@@ -542,7 +562,8 @@ void localusersetaccountwithuserid(nick *np, char *accname, unsigned long accid)
   SetAccount(np);
   strncpy(np->authname, accname, ACCOUNTLEN);
   np->authname[ACCOUNTLEN]='\0';
-  np->accountts=getnettime();
+  np->accountts=authTS?authTS:getnettime();
+  np->accountflags=accountflags;
 
   if (accid) {
     np->auth=findorcreateauthname(accid);
@@ -554,7 +575,9 @@ void localusersetaccountwithuserid(nick *np, char *accname, unsigned long accid)
   }
 
   if (connected) {
-    if (np->auth) {
+    if (np->accountflags) {
+      irc_send("%s AC %s %s %ld %lu %lu",mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts, np->auth?np->auth->userid:0, np->accountflags);
+    } else if (np->auth) {
       irc_send("%s AC %s %s %ld %lu",mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts, np->auth->userid);
     } else {
       irc_send("%s AC %s %s %ld",mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts);