add pool for patricia, dump old stuff from nick

diff --git a/core/nsmalloc.h b/core/nsmalloc.h
index 5498a283a2c09b1b5a402a113d1894148c12ba65..657a582804aea3cf3019b4b6baa0f16140aef55f 100644 (file)
--- a/core/nsmalloc.h
+++ b/core/nsmalloc.h
@@ -59,6 +59,7 @@ beginpools() {
   pool(NTERFACER),
   pool(SQLITE),
   pool(PQSQL),
+  pool(PATRICIA),
 } endpools()
 
 #undef pool

diff --git a/nick/nick.c b/nick/nick.c
index c269cfc67de146c0c6fbedfbda0753b7afd93dbe..679f05549859b6bf03ad232135c1cd8813abc0ae 100644 (file)
--- a/nick/nick.c
+++ b/nick/nick.c
@@ -48,8 +48,6 @@ nick *nicktable[NICKHASHSIZE];
 nick **servernicks[MAXSERVERS];
 
 sstring *nickextnames[MAXNICKEXTS];
-sstring *nodeextnames[PATRICIA_MAXSLOTS];
-patricia_tree_t *iptree;
 
 void nickstats(int hooknum, void *arg);
 
@@ -83,8 +81,6 @@ void _init() {
   
   /* Fake the addition of our own server */
   handleserverchange(HOOK_SERVER_NEWSERVER,(void *)numerictolong(mynumeric->content,2));
-
-  iptree = patricia_new_tree(PATRICIA_MAXBITS);
 }
 
 void _fini() {
@@ -409,47 +405,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->exts[index]=NULL;
-  } PATRICIA_WALK_END;
-}

diff --git a/nick/nick.h b/nick/nick.h
index f00fbe0014ee070df9abf75a356fb9c3fb70a5de..6adfa0e4bb0d44c197c22dac424727c03054e595 100644 (file)
--- a/nick/nick.h
+++ b/nick/nick.h
@@ -10,7 +10,7 @@
 #include "../server/server.h"
 #include "../lib/base64.h"
 #include "../lib/irc_ipv6.h"
-#include "../lib/patricia.h"
+#include "../patricia/patricia.h"
 
 #include "../authext/authext.h"
 
@@ -147,7 +147,6 @@ extern host *hosttable[HOSTHASHSIZE];
 extern realname *realnametable[REALNAMEHASHSIZE];
 extern const flag umodeflags[];
 extern const flag accountflags[];
-extern patricia_tree_t *iptree;
 
 #define MAXNUMERIC 0x3FFFFFFF
 
@@ -181,9 +180,6 @@ int findnickext(const char *name);
 void releasenickext(int index);
 char *visiblehostmask(nick *np, char *buf);
 char *visibleuserhost(nick *np, char *buf);
-int registernodeext(const char *name);
-int findnodeext(const char *name);
-void releasenodeext(int index);
 
 /* nickhandlers.c functions */
 int handlenickmsg(void *source, int cargc, char **cargv);