merge

[plan9front.git] / sys / src / cmd / ndb / dn.c

diff --git a/sys/src/cmd/ndb/dn.c b/sys/src/cmd/ndb/dn.c
index 412acbe1131c90c5f439bbc20bc1ab34d8c26344..dd566be067d871eb633510f77030f838cbb5e700 100644 (file)
--- a/sys/src/cmd/ndb/dn.c
+++ b/sys/src/cmd/ndb/dn.c
@@ -1,7 +1,6 @@
 #include <u.h>
 #include <libc.h>
 #include <ip.h>
-#include <pool.h>
 #include <ctype.h>
 #include "dns.h"
 
@@ -234,6 +233,15 @@ idnlookup(char *name, int class, int enter)
        return dnlookup(name, class, enter);
 }
 
+DN*
+ipalookup(uchar *ip, int class, int enter)
+{
+       char addr[64];
+
+       snprint(addr, sizeof(addr), "%I", ip);
+       return dnlookup(addr, class, enter);
+}
+
 static int
 rrsame(RR *rr1, RR *rr2)
 {
@@ -673,8 +681,6 @@ getactivity(Request *req, int recursive)
 void
 putactivity(int recursive)
 {
-       static ulong lastclean;
-
        if(traceactivity)
                dnslog("put: %d active by pid %d",
                        dnvars.active, getpid());
@@ -702,17 +708,11 @@ putactivity(int recursive)
        }
        unlock(&dnvars);
 
-       dncheck();
-
        db2cache(needrefresh);
-       dncheck();
 
        dnageall(0);
 
-       dncheck();
-
        /* let others back in */
-       lastclean = now;
        needrefresh = 0;
        dnvars.mutex = 0;
 }
@@ -1548,39 +1548,6 @@ slave(Request *req)
        }
 }
 
-/*
- *  chasing down double free's
- */
-void
-dncheck(void)
-{
-       int i;
-       DN *dp;
-       RR *rp;
-
-       if(!testing)
-               return;
-
-       lock(&dnlock);
-       poolcheck(mainmem);
-       for(i = 0; i < HTLEN; i++)
-               for(dp = ht[i]; dp; dp = dp->next){
-                       assert(dp->magic == DNmagic);
-                       for(rp = dp->rr; rp; rp = rp->next){
-                               assert(rp->magic == RRmagic);
-                               assert(rp->cached);
-                               assert(rp->owner == dp);
-                               /* also check for duplicate rrs */
-                               if (rronlist(rp, rp->next)) {
-                                       dnslog("%R duplicates its next chain "
-                                               "(%R); aborting", rp, rp->next);
-                                       abort();
-                               }
-                       }
-               }
-       unlock(&dnlock);
-}
-
 static int
 rrequiv(RR *r1, RR *r2)
 {