Browse Source

Plan 9 from Bell Labs 2008-08-08

David du Colombier 12 years ago
parent
commit
ab97193758

+ 9 - 9
dist/replica/_plan9.db

@@ -349,7 +349,7 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1209614440 151743
 386/bin/ndb/csquery - 775 sys sys 1209614441 61663
-386/bin/ndb/dns - 775 sys sys 1210392844 298971
+386/bin/ndb/dns - 775 sys sys 1218136573 298996
 386/bin/ndb/dnsdebug - 775 sys sys 1210392851 272792
 386/bin/ndb/dnsquery - 775 sys sys 1209614460 64416
 386/bin/ndb/dnstcp - 775 sys sys 1210392858 270683
@@ -457,7 +457,7 @@
 386/bin/units - 775 sys sys 1209614695 75419
 386/bin/unlnfs - 775 sys sys 1209614697 72523
 386/bin/unmount - 775 sys sys 1148500700 36646
-386/bin/unvac - 775 sys sys 1214510164 229061
+386/bin/unvac - 775 sys sys 1218136577 228866
 386/bin/unzip - 775 sys sys 1210393005 91104
 386/bin/upas - 20000000775 sys sys 1016857390 0
 386/bin/upas/addhash - 775 sys sys 1209614703 70732
@@ -499,8 +499,8 @@
 386/bin/usb/usbmouse - 775 sys sys 1210393045 129634
 386/bin/usb/usbprint - 775 sys sys 1203567409 373
 386/bin/usb/usbprobe - 775 sys sys 1203567409 232
-386/bin/vac - 775 sys sys 1214510176 229641
-386/bin/vacfs - 775 sys sys 1214510182 243823
+386/bin/vac - 775 sys sys 1218136581 229446
+386/bin/vacfs - 775 sys sys 1218136585 243628
 386/bin/venti - 20000000775 sys sys 947360466 0
 386/bin/venti/buildindex - 775 sys sys 1214510186 259348
 386/bin/venti/checkarenas - 775 sys sys 1214510193 261127
@@ -5294,7 +5294,7 @@ lib/tftpd - 20000000775 sys sys 1020895767 0
 lib/unicode - 664 sys sys 958440028 223312
 lib/unicode.notice - 664 sys sys 958504386 1398
 lib/units - 664 sys sys 1071415518 9997
-lib/vgadb - 664 sys sys 1200170799 31502
+lib/vgadb - 664 sys sys 1218125419 31621
 lib/video.specs - 664 sys sys 1175869533 2942
 lib/volcanoes - 664 sys sys 944944024 119831
 lib/words - 664 sys sys 1014923442 247097
@@ -8063,7 +8063,7 @@ sys/src/9/ip/ptclbsum.c - 664 sys sys 1022588099 1243
 sys/src/9/ip/rudp.c - 664 sys sys 1204231129 20834
 sys/src/9/ip/tcp.c - 664 sys sys 1203551505 66252
 sys/src/9/ip/tripmedium.c - 664 sys sys 1045063515 7136
-sys/src/9/ip/udp.c - 664 sys sys 1187735914 13315
+sys/src/9/ip/udp.c - 664 sys sys 1218084651 12414
 sys/src/9/mkfile - 664 sys sys 1063857477 205
 sys/src/9/mtx - 20000000775 sys sys 1123676466 0
 sys/src/9/mtx/clock.c - 664 sys sys 1206317920 1344
@@ -12854,8 +12854,8 @@ sys/src/cmd/ndb/dn.c - 664 sys sys 1203748557 37967
 sys/src/cmd/ndb/dnarea.c - 664 sys sys 1175664421 2519
 sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1204179585 3112
 sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1207506938 35403
-sys/src/cmd/ndb/dns.c - 664 sys sys 1210369514 18107
-sys/src/cmd/ndb/dns.h - 664 sys sys 1202761152 11969
+sys/src/cmd/ndb/dns.c - 664 sys sys 1218125694 18125
+sys/src/cmd/ndb/dns.h - 664 sys sys 1218084580 11999
 sys/src/cmd/ndb/dnsdebug.c - 664 sys sys 1194216583 8790
 sys/src/cmd/ndb/dnserver.c - 664 sys sys 1198183920 4630
 sys/src/cmd/ndb/dnsquery.c - 664 sys sys 1185315254 2507
@@ -14331,7 +14331,7 @@ sys/src/cmd/vac - 20000000775 sys sys 1055699701 0
 sys/src/cmd/vac/dat.h - 664 sys sys 1213498239 801
 sys/src/cmd/vac/error.c - 664 sys sys 1213498239 709
 sys/src/cmd/vac/error.h - 664 sys sys 1213498239 444
-sys/src/cmd/vac/file.c - 664 sys sys 1213558399 38892
+sys/src/cmd/vac/file.c - 664 sys sys 1218084559 38913
 sys/src/cmd/vac/fns.h - 664 sys sys 1213558385 778
 sys/src/cmd/vac/mkfile - 664 sys sys 1213498239 333
 sys/src/cmd/vac/pack.c - 664 sys sys 1213558400 11975

+ 9 - 9
dist/replica/plan9.db

@@ -349,7 +349,7 @@
 386/bin/ndb - 20000000775 sys sys 985743147 0
 386/bin/ndb/cs - 775 sys sys 1209614440 151743
 386/bin/ndb/csquery - 775 sys sys 1209614441 61663
-386/bin/ndb/dns - 775 sys sys 1210392844 298971
+386/bin/ndb/dns - 775 sys sys 1218136573 298996
 386/bin/ndb/dnsdebug - 775 sys sys 1210392851 272792
 386/bin/ndb/dnsquery - 775 sys sys 1209614460 64416
 386/bin/ndb/dnstcp - 775 sys sys 1210392858 270683
@@ -457,7 +457,7 @@
 386/bin/units - 775 sys sys 1209614695 75419
 386/bin/unlnfs - 775 sys sys 1209614697 72523
 386/bin/unmount - 775 sys sys 1148500700 36646
-386/bin/unvac - 775 sys sys 1214510164 229061
+386/bin/unvac - 775 sys sys 1218136577 228866
 386/bin/unzip - 775 sys sys 1210393005 91104
 386/bin/upas - 20000000775 sys sys 1016857390 0
 386/bin/upas/addhash - 775 sys sys 1209614703 70732
@@ -499,8 +499,8 @@
 386/bin/usb/usbmouse - 775 sys sys 1210393045 129634
 386/bin/usb/usbprint - 775 sys sys 1203567409 373
 386/bin/usb/usbprobe - 775 sys sys 1203567409 232
-386/bin/vac - 775 sys sys 1214510176 229641
-386/bin/vacfs - 775 sys sys 1214510182 243823
+386/bin/vac - 775 sys sys 1218136581 229446
+386/bin/vacfs - 775 sys sys 1218136585 243628
 386/bin/venti - 20000000775 sys sys 947360466 0
 386/bin/venti/buildindex - 775 sys sys 1214510186 259348
 386/bin/venti/checkarenas - 775 sys sys 1214510193 261127
@@ -5294,7 +5294,7 @@ lib/tftpd - 20000000775 sys sys 1020895767 0
 lib/unicode - 664 sys sys 958440028 223312
 lib/unicode.notice - 664 sys sys 958504386 1398
 lib/units - 664 sys sys 1071415518 9997
-lib/vgadb - 664 sys sys 1200170799 31502
+lib/vgadb - 664 sys sys 1218125419 31621
 lib/video.specs - 664 sys sys 1175869533 2942
 lib/volcanoes - 664 sys sys 944944024 119831
 lib/words - 664 sys sys 1014923442 247097
@@ -8063,7 +8063,7 @@ sys/src/9/ip/ptclbsum.c - 664 sys sys 1022588099 1243
 sys/src/9/ip/rudp.c - 664 sys sys 1204231129 20834
 sys/src/9/ip/tcp.c - 664 sys sys 1203551505 66252
 sys/src/9/ip/tripmedium.c - 664 sys sys 1045063515 7136
-sys/src/9/ip/udp.c - 664 sys sys 1187735914 13315
+sys/src/9/ip/udp.c - 664 sys sys 1218084651 12414
 sys/src/9/mkfile - 664 sys sys 1063857477 205
 sys/src/9/mtx - 20000000775 sys sys 1123676466 0
 sys/src/9/mtx/clock.c - 664 sys sys 1206317920 1344
@@ -12854,8 +12854,8 @@ sys/src/cmd/ndb/dn.c - 664 sys sys 1203748557 37967
 sys/src/cmd/ndb/dnarea.c - 664 sys sys 1175664421 2519
 sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1204179585 3112
 sys/src/cmd/ndb/dnresolve.c - 664 sys sys 1207506938 35403
-sys/src/cmd/ndb/dns.c - 664 sys sys 1210369514 18107
-sys/src/cmd/ndb/dns.h - 664 sys sys 1202761152 11969
+sys/src/cmd/ndb/dns.c - 664 sys sys 1218125694 18125
+sys/src/cmd/ndb/dns.h - 664 sys sys 1218084580 11999
 sys/src/cmd/ndb/dnsdebug.c - 664 sys sys 1194216583 8790
 sys/src/cmd/ndb/dnserver.c - 664 sys sys 1198183920 4630
 sys/src/cmd/ndb/dnsquery.c - 664 sys sys 1185315254 2507
@@ -14331,7 +14331,7 @@ sys/src/cmd/vac - 20000000775 sys sys 1055699701 0
 sys/src/cmd/vac/dat.h - 664 sys sys 1213498239 801
 sys/src/cmd/vac/error.c - 664 sys sys 1213498239 709
 sys/src/cmd/vac/error.h - 664 sys sys 1213498239 444
-sys/src/cmd/vac/file.c - 664 sys sys 1213558399 38892
+sys/src/cmd/vac/file.c - 664 sys sys 1218084559 38913
 sys/src/cmd/vac/fns.h - 664 sys sys 1213558385 778
 sys/src/cmd/vac/mkfile - 664 sys sys 1213498239 333
 sys/src/cmd/vac/pack.c - 664 sys sys 1213558400 11975

+ 10 - 0
dist/replica/plan9.log

@@ -20110,3 +20110,13 @@
 1217217603 0 c 386/bin/mk - 775 sys sys 1217215970 143398
 1217458803 0 c sys/src/cmd/usb/usbd/hub.c - 664 sys sys 1217457665 4292
 1217476804 0 c 386/bin/usb/usbd - 775 sys sys 1217475989 132446
+1218085205 0 c sys/src/9/ip/udp.c - 664 sys sys 1218084651 12414
+1218085205 1 c sys/src/cmd/ndb/dns.c - 664 sys sys 1218084580 18124
+1218085205 2 c sys/src/cmd/ndb/dns.h - 664 sys sys 1218084580 11999
+1218085205 3 c sys/src/cmd/vac/file.c - 664 sys sys 1218084559 38913
+1218126605 0 c lib/vgadb - 664 sys sys 1218125419 31621
+1218126605 1 c sys/src/cmd/ndb/dns.c - 664 sys sys 1218125694 18125
+1218137404 0 c 386/bin/ndb/dns - 775 sys sys 1218136573 298996
+1218137404 1 c 386/bin/unvac - 775 sys sys 1218136577 228866
+1218137404 2 c 386/bin/vac - 775 sys sys 1218136581 229446
+1218137404 3 c 386/bin/vacfs - 775 sys sys 1218136585 243628

+ 8 - 0
lib/vgadb

@@ -1016,6 +1016,14 @@ cpd-1304
 	videobw=65
 	alias=multisync
 
+#
+# Sony CPD-4410 CRT
+#
+cpd-4410=1600x1200
+	defaultclock=161.00
+	shb=1664 ehb=1856 ht=2160
+	vrs=1201 vre=1204 vt=1250
+
 #
 # Viewsonic 17 (model no. 1782)
 # Horizontal timing:

+ 1 - 33
sys/src/9/ip/udp.c

@@ -24,7 +24,6 @@ enum
 
 	IP_UDPPROTO	= 17,
 	UDP_USEAD7	= 52,
-	UDP_USEAD6	= 36,
 
 	Udprxms		= 200,
 	Udptickms	= 100,
@@ -217,21 +216,6 @@ udpkick(void *x, Block *bp)
 		rport = nhgets(bp->rp);
 		bp->rp += 2+2;			/* Ignore local port */
 		break;
-	case 6:					/* OBS */
-		/* get user specified addresses */
-		bp = pullupblock(bp, UDP_USEAD6);
-		if(bp == nil)
-			return;
-		ipmove(raddr, bp->rp);
-		bp->rp += IPaddrlen;
-		ipmove(laddr, bp->rp);
-		bp->rp += IPaddrlen;
-		/* pick interface closest to dest */
-		if(ipforme(f, laddr) != Runi)
-			findlocalip(f, laddr, raddr);
-		rport = nhgets(bp->rp);
-		bp->rp += 2+2;			/* Ignore local port */
-		break;
 	default:
 		rport = 0;
 		break;
@@ -509,15 +493,6 @@ udpiput(Proto *udp, Ipifc *ifc, Block *bp)
 		hnputs(p, rport); p += 2;
 		hnputs(p, lport);
 		break;
-	case 6:					/* OBS */
-		/* pass the src address */
-		bp = padblock(bp, UDP_USEAD6);
-		p = bp->rp;
-		ipmove(p, raddr); p += IPaddrlen;
-		ipmove(p, ipforme(f, laddr)==Runi ? laddr : ifc->lifc->local); p += IPaddrlen;
-		hnputs(p, rport); p += 2;
-		hnputs(p, lport);
-		break;
 	}
 
 	if(bp->next)
@@ -543,14 +518,7 @@ udpctl(Conv *c, char **f, int n)
 
 	ucb = (Udpcb*)c->ptcl;
 	if(n == 1){
-		if(strcmp(f[0], "oldheaders") == 0){	/* OBS */
-			ucb->headers = 6;
-			if (up)
-				print("program %s wrote `oldheaders' to udp "
-					"ctl file; fix or recompile it\n",
-					up->text);
-			return nil;
-		} else if(strcmp(f[0], "headers") == 0){
+		if(strcmp(f[0], "headers") == 0){
 			ucb->headers = 7;	/* new headers format */
 			return nil;
 		}

+ 4 - 4
sys/src/cmd/ndb/dns.c

@@ -424,8 +424,8 @@ io(void)
 	req.isslave = 0;
 	stop = 0;
 	while(!stop){
-		procsetname("served %d 9p; %d alarms; %d rpcs read",
-			stats.qrecvd9p, stats.alarms, stats.qrecvd9prpc);
+		procsetname("%d %s/dns Twrites of %d 9p rpcs read; %d alarms",
+			stats.qrecvd9p, mntpt, stats.qrecvd9prpc, stats.alarms);
 		n = read9pmsg(mfd[0], mdata, sizeof mdata);
 		if(n<=0){
 			dnslog("error reading 9P from %s: %r", mntpt);
@@ -738,8 +738,8 @@ rwrite(Job *job, Mfile *mf, Request *req)
 	} else if(strcmp(job->request.data, "stats")==0){
 		dnstats("/lib/ndb/dnsstats");
 		goto send;
-	} else if(strncmp(job->request.data, "target", 6)==0){
-		target = atol(job->request.data + 6);
+	} else if(strncmp(job->request.data, "target ", 7)==0){
+		target = atol(job->request.data + 7);
 		dnslog("target set to %ld", target);
 		goto send;
 	} else if(strcmp(job->request.data, "age")==0){

+ 1 - 0
sys/src/cmd/ndb/dns.h

@@ -338,6 +338,7 @@ struct Srv
 	ushort	weight;
 };
 
+typedef struct Rrlist Rrlist;
 struct Rrlist
 {
 	int	count;

+ 3 - 3
sys/src/cmd/vac/file.c

@@ -142,7 +142,7 @@ uvlong
 vacfilegetid(VacFile *f)
 {
 	/* immutable */
-fprint(2, "getid %s %lld+%lld = %lld\n", f->dir.elem, f->qidoffset, f->dir.qid, f->qidoffset+f->dir.qid);
+//fprint(2, "getid %s %lld+%lld = %lld\n", f->dir.elem, f->qidoffset, f->dir.qid, f->qidoffset+f->dir.qid);
 	return f->qidoffset + f->dir.qid;
 }
 
@@ -409,7 +409,7 @@ dirlookup(VacFile *f, char *elem)
 				filefree(ff);
 				goto Err;
 			}
-fprint(2, "offset %s %lld\n", ff->dir.elem, ff->dir.qidoffset);
+//fprint(2, "offset %s %lld\n", ff->dir.elem, ff->dir.qidoffset);
 			ff->qidoffset = f->qidoffset + ff->dir.qidoffset;
 			vtfileunlock(meta);
 			vtblockput(b);
@@ -1763,7 +1763,7 @@ vacfsopen(VtConn *z, char *file, int mode, int ncache)
 	char *prefix;
 	
 	if(vtparsescore(file, &prefix, score) >= 0){
-		if(strcmp(prefix, "vac") != 0){
+		if(prefix == nil || strcmp(prefix, "vac") != 0){
 			werrstr("not a vac file");
 			return nil;
 		}