diff options
| -rw-r--r-- | sys/man/8/ndb | 5 | ||||
| -rw-r--r-- | sys/src/cmd/ndb/dn.c | 3 | ||||
| -rw-r--r-- | sys/src/cmd/ndb/dnarea.c | 50 | ||||
| -rw-r--r-- | sys/src/cmd/ndb/dnsdebug.c | 16 |
4 files changed, 49 insertions, 25 deletions
diff --git a/sys/man/8/ndb b/sys/man/8/ndb index af4df056d..f6da3bbb8 100644 --- a/sys/man/8/ndb +++ b/sys/man/8/ndb @@ -97,7 +97,7 @@ query, ipquery, mkhash, mkdb, mkhosts, cs, csquery, dns, dnstcp, dnsquery, dnsde .br .B ndb/dnsdebug [ -.B -rx +.B -rxc ] [ .B -f .I dbfile @@ -758,6 +758,9 @@ to use the interface and .B /lib/ndb/external database file. +The +.B -c +option enables caching which is handy for debugging the dns code. .PP .I Ndb/dnsgetip resolves and prints A and AAAA records without consulting diff --git a/sys/src/cmd/ndb/dn.c b/sys/src/cmd/ndb/dn.c index 71768e7e3..5a789925f 100644 --- a/sys/src/cmd/ndb/dn.c +++ b/sys/src/cmd/ndb/dn.c @@ -641,7 +641,8 @@ dnauthdb(void) if(rp->ttl < minttl) rp->ttl = minttl; rp->auth = 1; - } + } else if(rp->type == Tns && inmyarea(rp->host->name)) + rp->auth = 1; } l = &rp->next; } diff --git a/sys/src/cmd/ndb/dnarea.c b/sys/src/cmd/ndb/dnarea.c index 3418d4686..5d459b328 100644 --- a/sys/src/cmd/ndb/dnarea.c +++ b/sys/src/cmd/ndb/dnarea.c @@ -7,36 +7,36 @@ Area *owned, *delegated; +static Area* +nameinarea(char *name, Area *s) +{ + int len; + + for(len = strlen(name); s != nil; s = s->next){ + if(s->len > len) + continue; + if(cistrcmp(s->soarr->owner->name, name + len - s->len) == 0) + if(len == s->len || name[len - s->len - 1] == '.') + return s; + } + return nil; +} + /* * true if a name is in our area */ Area* inmyarea(char *name) { - int len; Area *s, *d; - len = strlen(name); - for(s = owned; s; s = s->next){ - if(s->len > len) - continue; - if(cistrcmp(s->soarr->owner->name, name + len - s->len) == 0) - if(len == s->len || name[len - s->len - 1] == '.') - break; - } + s = nameinarea(name, owned); if(s == nil) return nil; - - /* name is in area `s' */ - for(d = delegated; d; d = d->next){ - if(d->len > len) - continue; - if(cistrcmp(d->soarr->owner->name, name + len - d->len) == 0) - if(len == d->len || name[len - d->len - 1] == '.') - return nil; /* name is in a delegated subarea */ - } - - return s; /* name is in area `s' and not in a delegated subarea */ + d = nameinarea(name, delegated); + if(d && d->len > s->len) + return nil; + return s; /* name is in owned area `s' and not in a delegated subarea */ } /* @@ -48,6 +48,9 @@ addarea(DN *dp, RR *rp, Ndbtuple *t) { Area *s; Area **l; + int len; + + len = strlen(dp->name); lock(&dnlock); if(t->val[0]) @@ -55,11 +58,14 @@ addarea(DN *dp, RR *rp, Ndbtuple *t) else l = &owned; - for (s = *l; s != nil; s = s->next) + for (s = *l; s != nil; l = &s->next, s = s->next){ + if(s->len < len) + break; if(s->soarr->owner == dp) { unlock(&dnlock); return; /* we've already got one */ } + } /* * The area contains a copy of the soa rr that created it. @@ -67,7 +73,7 @@ addarea(DN *dp, RR *rp, Ndbtuple *t) * as the area does. */ s = emalloc(sizeof(*s)); - s->len = strlen(dp->name); + s->len = len; rrcopy(rp, &s->soarr); s->soarr->owner = dp; s->soarr->db = 1; diff --git a/sys/src/cmd/ndb/dnsdebug.c b/sys/src/cmd/ndb/dnsdebug.c index 092e0c7b3..650e705d9 100644 --- a/sys/src/cmd/ndb/dnsdebug.c +++ b/sys/src/cmd/ndb/dnsdebug.c @@ -56,9 +56,16 @@ main(int argc, char *argv[]) case 'f': dbfile = EARGF(usage()); break; + case 'c': + cfg.cachedb = 1; + break; case 'r': cfg.resolver = 1; break; + case 'd': + debug = 1; + traceactivity = 1; + break; case 'x': dbfile = "/lib/ndb/external"; strcpy(mntpt, "/net.alt"); @@ -73,6 +80,7 @@ main(int argc, char *argv[]) fmtinstall('R', prettyrrfmt); opendatabase(); srand(truerand()); + db2cache(1); if(cfg.resolver) squirrelserveraddrs(); @@ -89,7 +97,6 @@ main(int argc, char *argv[]) p[Blinelen(&in)-1] = 0; n = tokenize(p, f, 3); if(n>=1) { - dnpurge(); /* flush the cache */ docmd(n, f); } } @@ -457,6 +464,12 @@ docmd(int n, char **f) name = type = nil; tmpsrv = 0; + if(strcmp(f[0], "refresh") == 0){ + db2cache(1); + dnageall(0); + return; + } + if(*f[0] == '@') { if(setserver(f[0]+1) < 0) return; @@ -483,6 +496,7 @@ docmd(int n, char **f) if(name == nil) return; + if(!cfg.cachedb) dnpurge(); /* flush the cache */ doquery(name, type); if(tmpsrv) |