NICK: Add "away" functionality.

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

diff --git a/nick/nick.c b/nick/nick.c
index f739384706b90ca1b128abda72735955c0b3635e..3b9dead2bb69ae4e3cae2bd34edc4588792a2ac7 100644 (file)
--- a/nick/nick.c
+++ b/nick/nick.c
@@ -37,22 +37,45 @@ const flag umodeflags[] = {
    { 'P', UMODE_PARANOID },
    { '\0', 0 } };
 
+const flag accountflags[] = {
+   { 'q', AFLAG_STAFF },
+   { 'h', AFLAG_SUPPORT },
+   { 'o', AFLAG_OPER },
+   { 'a', AFLAG_ADMIN },
+   { 'd', AFLAG_DEVELOPER },
+   { '\0', 0 } };
+
 #define nickhash(x)       ((crc32i(x))%NICKHASHSIZE)
 
 nick *nicktable[NICKHASHSIZE];
 nick **servernicks[MAXSERVERS];
 
 sstring *nickextnames[MAXNICKEXTS];
-sstring *nodeextnames[PATRICIA_MAXSLOTS];
-patricia_tree_t *iptree;
 
 void nickstats(int hooknum, void *arg);
 
+char *NULLAUTHNAME = "";
+
 void _init() {
+  unsigned int i;
+  authname *anp;
+
+  /* Clear up the nicks in authext */
+  for (i=0;i<AUTHNAMEHASHSIZE;i++) 
+    for (anp=authnametable[i];anp;anp=anp->next)
+      anp->nicks=NULL;  
+
   initnickalloc();
   initnickhelpers();
   memset(nicktable,0,sizeof(nicktable));
   memset(servernicks,0,sizeof(servernicks));
+
+  /* If we're connected to IRC, force a disconnect.  This needs to be done
+   * before we register all our hooks which would otherwise get called
+   * during the disconnect. */
+  if (connected) {
+    irc_send("%s SQ %s 0 :Resync [adding nick support]",mynumeric->content,myserver->content); irc_disconnected();
+  }
   
   /* Register our hooks */
   registerhook(HOOK_SERVER_NEWSERVER,&handleserverchange);
@@ -67,16 +90,31 @@ void _init() {
   registerserverhandler("W",&handlewhoismsg,2);
   registerserverhandler("AC",&handleaccountmsg,4);
   registerserverhandler("R",&handlestatsmsg,2);
+  registerserverhandler("P",&handleprivmsg,2);
+  registerserverhandler("A",&handleawaymsg,1);
   
   /* Fake the addition of our own server */
   handleserverchange(HOOK_SERVER_NEWSERVER,(void *)numerictolong(mynumeric->content,2));
-
-  iptree = patricia_new_tree(PATRICIA_MAXBITS);
 }
 
 void _fini() {
+  nick *np;
+  int i;
+
+  fininickhelpers();
+
+  for (i=0;i<NICKHASHSIZE;i++) {
+    for (np=nicktable[i];np;np=np->next) {
+      freesstring(np->shident);
+      freesstring(np->sethost);
+      freesstring(np->opername);
+      if(!np->auth && np->authname && (np->authname != NULLAUTHNAME))
+        free(np->authname);
+    }
+  }
+
   nsfreeall(POOL_NICK);
-  
+
   /* Free the hooks */
   deregisterhook(HOOK_SERVER_NEWSERVER,&handleserverchange);
   deregisterhook(HOOK_SERVER_LOSTSERVER,&handleserverchange);
@@ -90,6 +128,8 @@ void _fini() {
   deregisterserverhandler("W",&handlewhoismsg);
   deregisterserverhandler("AC",&handleaccountmsg);
   deregisterserverhandler("R",&handlestatsmsg);  
+  deregisterserverhandler("P",&handleprivmsg);
+  deregisterserverhandler("A",&handleawaymsg);
 }
 
 /*
@@ -152,24 +192,29 @@ void deletenick(nick *np) {
   releaserealname(np->realname);
   releasehost(np->host);
   
-  if(IsAccount(np) && np->auth)
-  {
-    np->auth->usercount--;
+  if(IsAccount(np)) {
+    if(!np->auth) {
+      if(np->authname && (np->authname != NULLAUTHNAME))
+        free(np->authname);
+    } else {
+      np->auth->usercount--;
     
-    for (nh=&(np->auth->nicks);*nh;nh=&((*nh)->nextbyauthname)) {
-      if (*nh==np) {
-        *nh=np->nextbyauthname;
-        break;
+      for (nh=&(np->auth->nicks);*nh;nh=&((*nh)->nextbyauthname)) {
+        if (*nh==np) {
+          *nh=np->nextbyauthname;
+          break;
+        }
       }
-    }
     
-    releaseauthname(np->auth);
+      releaseauthname(np->auth);
+    }
   }
   
   freesstring(np->shident); /* freesstring(NULL) is OK */
   freesstring(np->sethost); 
+  freesstring(np->opername); 
 
-  np->ipnode->usercount--;
+  node_decrement_usercount(np->ipnode);
   derefnode(iptree, np->ipnode);
   
   /* TODO: figure out how to cleanly remove nodes without affecting other modules */
@@ -293,6 +338,19 @@ void releasenickext(int index) {
  */
 
 char *visiblehostmask(nick *np, char *buf) {
+  char uhbuf[USERLEN+HOSTLEN+2];
+  
+  visibleuserhost(np, uhbuf);
+  sprintf(buf,"%s!%s",np->nick,uhbuf);
+
+  return buf;
+}
+
+/* visibleuserhost
+ *  As above without nick
+ */
+
+char *visibleuserhost(nick *np, char *buf) {
   char hostbuf[HOSTLEN+1];
   char *ident, *host;
 
@@ -311,7 +369,7 @@ char *visiblehostmask(nick *np, char *buf) {
     host=hostbuf;
   }
 
-  sprintf(buf,"%s!%s@%s",np->nick,ident,host);
+  sprintf(buf,"%s@%s",ident,host);
 
   return buf;
 }
@@ -371,47 +429,3 @@ nick *getnickbynumericstr(char *numericstr) {
 
 #endif
 
-int registernodeext(const char *name) {
-  int i;
-
-  if (findnodeext(name)!=-1) {
-    Error("nick",ERR_WARNING,"Tried to register duplicate node extension %s",name);
-    return -1;
-  }
-
-  for (i=0;i<PATRICIA_MAXSLOTS;i++) {
-    if (nodeextnames[i]==NULL) {
-      nodeextnames[i]=getsstring(name,100);
-      return i;
-    }
-  }
-
-  Error("nick",ERR_WARNING,"Tried to register too many extensions: %s",name);
-  return -1;
-}
-
-int findnodeext(const char *name) {
-  int i;
-
-  for (i=0;i<PATRICIA_MAXSLOTS;i++) {
-    if (nodeextnames[i]!=NULL && !ircd_strcmp(name,nodeextnames[i]->content)) {
-      return i;
-    }
-  }
-
-  return -1;
-}
-
-void releasenodeext(int index) {
-  patricia_node_t *head, *node;
-
-  freesstring(nodeextnames[index]);
-  nodeextnames[index]=NULL;
-
-  head = iptree->head;
-
-  PATRICIA_WALK_ALL(head, node)
-  {
-      node->slots[index]=NULL;
-  } PATRICIA_WALK_END;
-}