Browse Source

Plan 9 from Bell Labs 2007-04-05

David du Colombier 17 years ago
parent
commit
e3b30a64de

+ 11 - 11
dist/replica/_plan9.db

@@ -341,10 +341,10 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1169612028 150911
 386/bin/ndb/csquery - 775 sys sys 1168402337 61702
-386/bin/ndb/dns - 775 sys sys 1175655233 277472
-386/bin/ndb/dnsdebug - 775 sys sys 1175655234 252202
+386/bin/ndb/dns - 775 sys sys 1175741630 277566
+386/bin/ndb/dnsdebug - 775 sys sys 1175741631 252249
 386/bin/ndb/dnsquery - 775 sys sys 1174704818 64417
-386/bin/ndb/dnstcp - 775 sys sys 1175655235 250598
+386/bin/ndb/dnstcp - 775 sys sys 1175741631 250678
 386/bin/ndb/ipquery - 775 sys sys 1169612031 96994
 386/bin/ndb/mkdb - 775 sys sys 1168402340 64211
 386/bin/ndb/mkhash - 775 sys sys 1168402340 84780
@@ -406,7 +406,7 @@
 386/bin/snap - 775 sys sys 1136346852 313627
 386/bin/snapfs - 775 sys sys 1134389876 388292
 386/bin/sniffer - 775 sys sys 1038443185 99028
-386/bin/snoopy - 775 sys sys 1174704819 186527
+386/bin/snoopy - 775 sys sys 1175741632 186561
 386/bin/sort - 775 sys sys 1168402349 82523
 386/bin/spin - 775 sys sys 1134151359 758520
 386/bin/split - 775 sys sys 1168402349 75886
@@ -7464,7 +7464,7 @@ sys/man/2/ctime - 664 sys sys 954378853 2547
 sys/man/2/ctype - 664 sys sys 1079535676 2611
 sys/man/2/debugger - 664 sys sys 944959696 8629
 sys/man/2/des - 664 sys sys 1032058673 3517
-sys/man/2/dial - 664 sys sys 1108158522 6594
+sys/man/2/dial - 664 sys sys 1175725019 6594
 sys/man/2/dirread - 664 sys sys 1015091519 1901
 sys/man/2/disk - 664 sys sys 1015091519 3188
 sys/man/2/draw - 664 sys sys 1059484405 19362
@@ -7751,7 +7751,7 @@ sys/man/8/mkpaqfs - 664 sys sys 1018386778 892
 sys/man/8/mksacfs - 664 sys sys 964886843 710
 sys/man/8/mouse - 664 sys sys 971455511 2476
 sys/man/8/na - 664 sys sys 958527089 859
-sys/man/8/ndb - 664 sys sys 1174774024 13164
+sys/man/8/ndb - 664 sys sys 1175725007 13255
 sys/man/8/newuser - 664 sys sys 1116954242 2418
 sys/man/8/nfsserver - 664 sys sys 1163208425 3587
 sys/man/8/pcmcia - 664 sys sys 944959679 408
@@ -12749,21 +12749,21 @@ sys/src/cmd/mug.c - 664 sys sys 1157143847 24888
 sys/src/cmd/mv.c - 664 sys sys 1163029439 4682
 sys/src/cmd/ndb - 20000000775 sys sys 1080135004 0
 sys/src/cmd/ndb/convDNS2M.c - 664 sys sys 1175642286 6881
-sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1174690173 10779
+sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1175728897 10892
 sys/src/cmd/ndb/cs.c - 664 sys sys 1163208159 33080
 sys/src/cmd/ndb/csquery.c - 664 sys sys 1174626119 1073
 sys/src/cmd/ndb/dblookup.c - 664 sys sys 1174792290 20940
 sys/src/cmd/ndb/dn.c - 664 sys sys 1175642250 32545
-sys/src/cmd/ndb/dnarea.c - 664 sys sys 1174626121 2505
-sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1174626121 3122
+sys/src/cmd/ndb/dnarea.c - 664 sys sys 1175664421 2519
+sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1175728921 3142
 sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1175642403 26242
 sys/src/cmd/ndb/dns.c - 664 sys sys 1175642266 15906
 sys/src/cmd/ndb/dns.h - 664 sys sys 1175642258 10561
 sys/src/cmd/ndb/dnsdebug.c - 664 sys sys 1174690026 8779
 sys/src/cmd/ndb/dnserver.c - 664 sys sys 1174626125 4400
 sys/src/cmd/ndb/dnsquery.c - 664 sys sys 1174626126 2435
-sys/src/cmd/ndb/dnstcp.c - 664 sys sys 1175642311 7419
-sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1175642323 5188
+sys/src/cmd/ndb/dnstcp.c - 664 sys sys 1175728913 7433
+sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1175728907 5204
 sys/src/cmd/ndb/ipquery.c - 664 sys sys 1124711423 773
 sys/src/cmd/ndb/mkdb.c - 664 sys sys 957402054 2886
 sys/src/cmd/ndb/mkfile - 664 sys sys 1174623575 1984

+ 11 - 11
dist/replica/plan9.db

@@ -341,10 +341,10 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1169612028 150911
 386/bin/ndb/csquery - 775 sys sys 1168402337 61702
-386/bin/ndb/dns - 775 sys sys 1175655233 277472
-386/bin/ndb/dnsdebug - 775 sys sys 1175655234 252202
+386/bin/ndb/dns - 775 sys sys 1175741630 277566
+386/bin/ndb/dnsdebug - 775 sys sys 1175741631 252249
 386/bin/ndb/dnsquery - 775 sys sys 1174704818 64417
-386/bin/ndb/dnstcp - 775 sys sys 1175655235 250598
+386/bin/ndb/dnstcp - 775 sys sys 1175741631 250678
 386/bin/ndb/ipquery - 775 sys sys 1169612031 96994
 386/bin/ndb/mkdb - 775 sys sys 1168402340 64211
 386/bin/ndb/mkhash - 775 sys sys 1168402340 84780
@@ -406,7 +406,7 @@
 386/bin/snap - 775 sys sys 1136346852 313627
 386/bin/snapfs - 775 sys sys 1134389876 388292
 386/bin/sniffer - 775 sys sys 1038443185 99028
-386/bin/snoopy - 775 sys sys 1174704819 186527
+386/bin/snoopy - 775 sys sys 1175741632 186561
 386/bin/sort - 775 sys sys 1168402349 82523
 386/bin/spin - 775 sys sys 1134151359 758520
 386/bin/split - 775 sys sys 1168402349 75886
@@ -7464,7 +7464,7 @@ sys/man/2/ctime - 664 sys sys 954378853 2547
 sys/man/2/ctype - 664 sys sys 1079535676 2611
 sys/man/2/debugger - 664 sys sys 944959696 8629
 sys/man/2/des - 664 sys sys 1032058673 3517
-sys/man/2/dial - 664 sys sys 1108158522 6594
+sys/man/2/dial - 664 sys sys 1175725019 6594
 sys/man/2/dirread - 664 sys sys 1015091519 1901
 sys/man/2/disk - 664 sys sys 1015091519 3188
 sys/man/2/draw - 664 sys sys 1059484405 19362
@@ -7751,7 +7751,7 @@ sys/man/8/mkpaqfs - 664 sys sys 1018386778 892
 sys/man/8/mksacfs - 664 sys sys 964886843 710
 sys/man/8/mouse - 664 sys sys 971455511 2476
 sys/man/8/na - 664 sys sys 958527089 859
-sys/man/8/ndb - 664 sys sys 1174774024 13164
+sys/man/8/ndb - 664 sys sys 1175725007 13255
 sys/man/8/newuser - 664 sys sys 1116954242 2418
 sys/man/8/nfsserver - 664 sys sys 1163208425 3587
 sys/man/8/pcmcia - 664 sys sys 944959679 408
@@ -12749,21 +12749,21 @@ sys/src/cmd/mug.c - 664 sys sys 1157143847 24888
 sys/src/cmd/mv.c - 664 sys sys 1163029439 4682
 sys/src/cmd/ndb - 20000000775 sys sys 1080135004 0
 sys/src/cmd/ndb/convDNS2M.c - 664 sys sys 1175642286 6881
-sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1174690173 10779
+sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1175728897 10892
 sys/src/cmd/ndb/cs.c - 664 sys sys 1163208159 33080
 sys/src/cmd/ndb/csquery.c - 664 sys sys 1174626119 1073
 sys/src/cmd/ndb/dblookup.c - 664 sys sys 1174792290 20940
 sys/src/cmd/ndb/dn.c - 664 sys sys 1175642250 32545
-sys/src/cmd/ndb/dnarea.c - 664 sys sys 1174626121 2505
-sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1174626121 3122
+sys/src/cmd/ndb/dnarea.c - 664 sys sys 1175664421 2519
+sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1175728921 3142
 sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1175642403 26242
 sys/src/cmd/ndb/dns.c - 664 sys sys 1175642266 15906
 sys/src/cmd/ndb/dns.h - 664 sys sys 1175642258 10561
 sys/src/cmd/ndb/dnsdebug.c - 664 sys sys 1174690026 8779
 sys/src/cmd/ndb/dnserver.c - 664 sys sys 1174626125 4400
 sys/src/cmd/ndb/dnsquery.c - 664 sys sys 1174626126 2435
-sys/src/cmd/ndb/dnstcp.c - 664 sys sys 1175642311 7419
-sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1175642323 5188
+sys/src/cmd/ndb/dnstcp.c - 664 sys sys 1175728913 7433
+sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1175728907 5204
 sys/src/cmd/ndb/ipquery.c - 664 sys sys 1124711423 773
 sys/src/cmd/ndb/mkdb.c - 664 sys sys 957402054 2886
 sys/src/cmd/ndb/mkfile - 664 sys sys 1174623575 1984

+ 14 - 0
dist/replica/plan9.log

@@ -48123,3 +48123,17 @@
 1175655606 0 c 386/bin/ndb/dns - 775 sys sys 1175655233 277472
 1175655606 1 c 386/bin/ndb/dnsdebug - 775 sys sys 1175655234 252202
 1175655606 2 c 386/bin/ndb/dnstcp - 775 sys sys 1175655235 250598
+1175664606 0 c sys/src/cmd/ndb/dnarea.c - 664 sys sys 1175664421 2519
+1175715006 0 c 386/bin/ndb/dns - 775 sys sys 1175714421 277485
+1175715006 1 c 386/bin/ndb/dnsdebug - 775 sys sys 1175714422 252215
+1175715006 2 c 386/bin/ndb/dnstcp - 775 sys sys 1175714423 250611
+1175725805 0 c sys/man/2/dial - 664 sys sys 1175725019 6594
+1175725805 1 c sys/man/8/ndb - 664 sys sys 1175725007 13255
+1175729406 0 c sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1175728897 10892
+1175729406 1 c sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1175728921 3142
+1175729406 2 c sys/src/cmd/ndb/dnstcp.c - 664 sys sys 1175728913 7433
+1175729406 3 c sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1175728907 5204
+1175742006 0 c 386/bin/snoopy - 775 sys sys 1175741632 186561
+1175742006 1 c 386/bin/ndb/dns - 775 sys sys 1175741630 277566
+1175742006 2 c 386/bin/ndb/dnsdebug - 775 sys sys 1175741631 252249
+1175742006 3 c 386/bin/ndb/dnstcp - 775 sys sys 1175741631 250678

+ 1 - 1
sys/man/2/dial

@@ -34,7 +34,7 @@ void  setnetmtpt(char *to, int tolen, char *from)
 NetConnInfo*  getnetconninfo(char *conndir, int fd)
 .PP
 .B
-void freenetconninfo(NetConnINfo*)
+void freenetconninfo(NetConnInfo*)
 .SH DESCRIPTION
 For these routines,
 .I addr

+ 7 - 2
sys/man/8/ndb

@@ -274,8 +274,13 @@ and that the outside network is mounted on
 .BR /net.alt .
 Queries for inside addresses will be sent via
 .B /net/udp
+(or
+.B /net/tcp
+in response to truncated replies)
 and those for outside addresses via
-.BR /net.alt/udp .
+.B /net.alt/udp
+(or
+.BR /net.alt/tcp ).
 This makes
 .I dns
 suitable for serving non-Plan-9 systems in an organization with
@@ -546,7 +551,7 @@ for you.
 is like
 .I ndb/dnsquery
 but bypasses the local server.
-It communicates via UDP with the domain name servers
+It communicates via UDP (and sometimes TCP) with the domain name servers
 in the same way that the local resolver would and displays
 all packets received.
 The query can be specified on the command line or

+ 5 - 2
sys/src/cmd/ndb/convM2DNS.c

@@ -515,7 +515,7 @@ convM2DNS(uchar *buf, int len, DNSmsg *m, int *codep)
 {
 	Scan scan;
 	Scan *sp;
-	char *err;
+	char *err = nil;
 	RR *rp = nil;
 
 	if (codep)
@@ -536,11 +536,14 @@ convM2DNS(uchar *buf, int len, DNSmsg *m, int *codep)
 	USHORT(m->ancount);
 	USHORT(m->nscount);
 	USHORT(m->arcount);
+//	if (mp->flags & Ftrunc)
+//		dnslog("truncated reply, len %d from %I", len, ibuf);
 
 	m->qd = rrloop(sp, "questions",	m->qdcount, 1);
 	m->an = rrloop(sp, "answers",	m->ancount, 0);
 	m->ns = rrloop(sp, "nameservers",m->nscount, 0);
-	err = scan.err;				/* live with bad ar's */
+	if (scan.err)
+		err = strdup(scan.err);		/* live with bad ar's */
 	m->ar = rrloop(sp, "hints",	m->arcount, 0);
 	if (codep)
 		*codep = scan.rcode;

+ 3 - 2
sys/src/cmd/ndb/dnarea.c

@@ -72,8 +72,9 @@ addarea(DN *dp, RR *rp, Ndbtuple *t)
 	s->neednotify = 1;
 	s->needrefresh = 0;
 
-	dnslog("new area %s %s", dp->name,
-		l == &delegated? "delegated": "owned");
+	if (debug)
+		dnslog("new area %s %s", dp->name,
+			l == &delegated? "delegated": "owned");
 
 	s->next = *l;
 	*l = s;

+ 3 - 1
sys/src/cmd/ndb/dnnotify.c

@@ -97,8 +97,10 @@ dnslog("sending %d byte notify to %s/%I.%d about %s", n, slave, up->raddr, nhget
 			continue;
 		memset(&repmsg, 0, sizeof repmsg);
 		err = convM2DNS(&ibuf[OUdphdrsize], len, &repmsg, nil);
-		if(err != nil)
+		if(err != nil) {
+			free(err);
 			continue;
+		}
 		if(repmsg.id == reqno && (repmsg.flags & Omask) == Onotify)
 			break;
 	}

+ 1 - 0
sys/src/cmd/ndb/dnstcp.c

@@ -105,6 +105,7 @@ main(int argc, char *argv[])
 		err = convM2DNS(buf, len, &reqmsg, &rcode);
 		if(err){
 			dnslog("server: input error: %s from %s", err, caller);
+			free(err);
 			break;
 		}
 		if (rcode == 0)

+ 3 - 0
sys/src/cmd/ndb/dnudpserver.c

@@ -120,12 +120,15 @@ restart:
 		getactivity(&req, 0);
 		req.aborttime = now + Maxreqtm;
 		rcode = 0;
+
 		err = convM2DNS(&buf[OUdphdrsize], len, &reqmsg, &rcode);
 		if(err){
 			/* first bytes in buf are source IP addr */
 			dnslog("server: input error: %s from %I", err, buf);
+			free(err);
 			continue;
 		}
+
 		if (rcode == 0)
 			if(reqmsg.qdcount < 1){
 				dnslog("server: no questions from %I", buf);