Add opername support to newserv, also add displaying of oper names in noperserv warni...

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

diff --git a/localuser/localuser.c b/localuser/localuser.c
index 1d7ee8f5e41e93c19210fca0418d4a7f6168223a..463918f4eaf1f446d2d5018cab4768709ec420ca 100644 (file)
--- a/localuser/localuser.c
+++ b/localuser/localuser.c
@@ -61,14 +61,17 @@ void _fini() {
   deregisterhook(HOOK_NICK_KILL,&checklocalkill);
   deregisterhook(HOOK_NICK_LOSTNICK,&checkpendingkills); /* CHECK ME -> should this hook KILL or LOSTNICK or BOTH */
   deregisterhook(HOOK_CORE_ENDOFHOOKSQUEUE,&clearpendingkills);
+  
+  deregisterserverhandler("P",&handleprivatemsgcmd);
+  deregisterserverhandler("O",&handleprivatenoticecmd);
 }
 
 /*
- * registerlocaluser:
+ * registerlocaluserwithuseridflags:
  *  This function creates a local user, and broadcasts it's existence to the net (if connected).
  */
 
-nick *registerlocaluser(char *nickname, char *ident, char *host, char *realname, char *authname, 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;
@@ -99,12 +102,14 @@ nick *registerlocaluser(char *nickname, char *ident, char *host, char *realname,
   newuser->umodes=umodes;
   
   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;
@@ -113,8 +118,20 @@ nick *registerlocaluser(char *nickname, char *ident, char *host, char *realname,
 
   if (IsAccount(newuser)) {
     strncpy(newuser->authname,authname,ACCOUNTLEN);
+    newuser->accountts=newuser->timestamp;
+    if (authid) {
+      newuser->auth=findorcreateauthname(authid, newuser->authname);
+      newuser->auth->usercount++;
+      newuser->nextbyauthname=newuser->auth->nicks;
+      newuser->auth->nicks=newuser;
+      newuser->auth->flags=accountflags;
+    } else {
+      newuser->auth=NULL;
+    }
   } else {
     newuser->authname[0]='\0';
+    newuser->accountts=0;
+    newuser->auth=NULL;
   }
   
   if (connected) {
@@ -189,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 */
@@ -198,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;
@@ -234,16 +259,38 @@ UserMessageHandler hooklocaluserhandler(nick *np, UserMessageHandler newhandler)
 
 void sendnickmsg(nick *np) {
   char numericbuf[6];
-  char ipbuf[25];
+  char ipbuf[25], operbuf[ACCOUNTLEN + 5];
+  char accountbuf[100];
 
   strncpy(numericbuf,longtonumeric(np->numeric,5),5);
   numericbuf[5]='\0';
-  
+
+  if(IsOper(np) && (serverlist[myhub].flags & SMODE_OPERNAME)) {
+    snprintf(operbuf,sizeof(operbuf)," %s",np->opername?np->opername->content:"-");
+  } else {
+    operbuf[0] = '\0';
+  }
+
+  if (IsAccount(np)) {
+    if (np->auth) {
+      if(np->auth->flags) {
+        snprintf(accountbuf,sizeof(accountbuf)," %s:%ld:%lu:" FLAG_T_SPECIFIER,np->authname,np->accountts,np->auth->userid,np->auth->flags);
+      } else {
+        snprintf(accountbuf,sizeof(accountbuf)," %s:%ld:%lu",np->authname,np->accountts,np->auth->userid);
+      }
+    } else if (np->accountts) {
+      snprintf(accountbuf,sizeof(accountbuf)," %s:%ld",np->authname,np->accountts);
+    } else {
+      snprintf(accountbuf,sizeof(accountbuf)," %s",np->authname);
+    }
+  } else {
+    accountbuf[0]='\0';
+  }
+
   irc_send("%s N %s 1 %ld %s %s %s%s%s %s %s :%s",
     mynumeric->content,np->nick,np->timestamp,np->ident,np->host->name->content,
-    printflags(np->umodes,umodeflags),IsAccount(np)?" ":"",
-    np->authname,iptobase64(ipbuf, &(np->p_ipaddr), sizeof(ipbuf), 1),numericbuf,
-    np->realname->name->content);
+    printflags(np->umodes,umodeflags),operbuf,accountbuf,iptobase64(ipbuf,&(np->p_ipaddr),
+    sizeof(ipbuf),1),numericbuf,np->realname->name->content);
 }
 
 void sendnickburst(int hooknum, void *arg) {
@@ -437,7 +484,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;
@@ -449,6 +496,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];
@@ -474,7 +525,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);
     }
 
@@ -501,7 +552,7 @@ void checkpendingkills(int hooknum, void *arg) {
 }
 
 /* Auth user */
-void localusersetaccount(nick *np, char *accname) {
+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;
@@ -510,9 +561,28 @@ void localusersetaccount(nick *np, char *accname) {
   SetAccount(np);
   strncpy(np->authname, accname, ACCOUNTLEN);
   np->authname[ACCOUNTLEN]='\0';
+  np->accountts=authTS?authTS:getnettime();
+
+  if (accid) {
+    np->auth=findorcreateauthname(accid, accname);
+    np->auth->usercount++;
+    np->nextbyauthname=np->auth->nicks;
+    np->auth->nicks=np;
+    np->auth->flags=accountflags;
+  } else {
+    np->auth=NULL;
+  }
 
   if (connected) {
-    irc_send("%s AC %s %s %ld",mynumeric->content, longtonumeric(np->numeric,5), np->authname, getnettime());
+    if (np->auth) {
+      if (np->auth->flags) {
+        irc_send("%s AC %s %s %ld %lu %lu",mynumeric->content, longtonumeric(np->numeric,5), np->authname, np->accountts, np->auth->userid, np->auth->flags);
+      } else {
+        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);
+    }
   }
 
   triggerhook(HOOK_NICK_ACCOUNT, np);