diff options
| author | rsc <devnull@localhost> | 2006-02-14 19:43:19 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2006-02-14 19:43:19 +0000 |
| commit | 5c9f76b5e5dc5c0537896b0e487b101dad38a746 (patch) | |
| tree | dfee973b76db00b0e011610298ca13c5a997e1c9 /src/cmd/ndb/dnresolve.c | |
| parent | 54357361fbc3032b36688bb4c1d4ced1f14f08f6 (diff) | |
| download | plan9port-5c9f76b5e5dc5c0537896b0e487b101dad38a746.tar.gz plan9port-5c9f76b5e5dc5c0537896b0e487b101dad38a746.tar.bz2 plan9port-5c9f76b5e5dc5c0537896b0e487b101dad38a746.zip | |
remove unused
Diffstat (limited to 'src/cmd/ndb/dnresolve.c')
| -rwxr-xr-x | src/cmd/ndb/dnresolve.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/cmd/ndb/dnresolve.c b/src/cmd/ndb/dnresolve.c index 253daca4..7ba17c0c 100755 --- a/src/cmd/ndb/dnresolve.c +++ b/src/cmd/ndb/dnresolve.c @@ -258,7 +258,7 @@ mkreq(DN *dp, int type, uchar *buf, int flags, ushort reqno) { DNSmsg m; int len; - OUdphdr *uh = (OUdphdr*)buf; + Udphdr *uh = (Udphdr*)buf; /* stuff port number into output buffer */ memset(uh, 0, sizeof(*uh)); @@ -271,7 +271,7 @@ mkreq(DN *dp, int type, uchar *buf, int flags, ushort reqno) m.qd = rralloc(type); m.qd->owner = dp; m.qd->type = type; - len = convDNS2M(&m, &buf[OUdphdrsize], Maxudp); + len = convDNS2M(&m, &buf[Udphdrsize], Maxudp); if(len < 0) abort(); /* "can't convert" */; rrfree(m.qd); @@ -319,14 +319,14 @@ readreply(int fd, DN *dp, int type, ushort req, /* timed read */ alarm((endtime - now) * 1000); - len = udpread(fd, (OUdphdr*)ibuf, ibuf+OUdphdrsize, Maxudpin); + len = udpread(fd, (Udphdr*)ibuf, ibuf+Udphdrsize, Maxudpin); alarm(0); if(len < 0) return -1; /* timed out */ /* convert into internal format */ memset(mp, 0, sizeof(*mp)); - err = convM2DNS(&ibuf[OUdphdrsize], len, mp); + err = convM2DNS(&ibuf[Udphdrsize], len, mp); if(err){ syslog(0, LOG, "input err %s: %I", err, ibuf); continue; @@ -544,6 +544,7 @@ netquery1(int fd, DN *dp, int type, RR *nsrp, Request *reqp, int depth, uchar *i Dest dest[Maxdest]; DNSmsg m; ulong endtime; + Udphdr *uh; /* pack request into a message */ req = rand(); @@ -591,10 +592,9 @@ netquery1(int fd, DN *dp, int type, RR *nsrp, Request *reqp, int depth, uchar *i if(debug) logsend(reqp->id, depth, obuf, p->s->name, dp->name, type); -{Udphdr *uh = (Udphdr*)obuf; -print("send %I %I %d %d\n", uh->raddr, uh->laddr, nhgets(uh->rport), nhgets(uh->lport)); -} - if(udpwrite(fd, (OUdphdr*)obuf, obuf+OUdphdrsize, len) < 0) + uh = (Udphdr*)obuf; + fprint(2, "send %I %I %d %d\n", uh->raddr, uh->laddr, nhgets(uh->rport), nhgets(uh->lport)); + if(udpwrite(fd, uh, obuf+Udphdrsize, len) < 0) warning("sending udp msg %r"); p->nx++; } @@ -732,10 +732,8 @@ netquery(DN *dp, int type, RR *nsrp, Request *reqp, int depth) return 0; /* use alloced buffers rather than ones from the stack */ - ibuf = emalloc(Maxudpin+OUdphdrsize); - obuf = emalloc(Maxudp+OUdphdrsize); - - slave(reqp); + ibuf = emalloc(Maxudpin+Udphdrsize); + obuf = emalloc(Maxudp+Udphdrsize); /* prepare server RR's for incremental lookup */ for(rp = nsrp; rp; rp = rp->next) |