Browse Source

Plan 9 from Bell Labs 2003-06-22

David du Colombier 16 years ago
parent
commit
77db210f9a

+ 4 - 5
dist/replica/plan9.db

@@ -4920,8 +4920,8 @@ sys/man/vol1.ps.gz - 664 sys sys 1020374752 2174519
 sys/src - 20000000775 sys sys 1016902537 0
 sys/src/9 - 20000000775 sys sys 1017795023 0
 sys/src/9/alphapc - 20000000775 sys sys 1018721238 0
-sys/src/9/alphapc/apc - 664 sys sys 1039753420 621
-sys/src/9/alphapc/apccpu - 664 sys sys 1039753419 507
+sys/src/9/alphapc/apc - 664 sys sys 1056171197 624
+sys/src/9/alphapc/apccpu - 664 sys sys 1056171198 510
 sys/src/9/alphapc/arch164.c - 664 sys sys 1015012783 6100
 sys/src/9/alphapc/audio.h - 664 sys sys 1015012783 349
 sys/src/9/alphapc/axp.h - 664 sys sys 1015012783 1090
@@ -9310,7 +9310,6 @@ sys/src/cmd/mk/symtab.c - 664 sys sys 944961025 1581
 sys/src/cmd/mk/var.c - 664 sys sys 944961025 539
 sys/src/cmd/mk/varsub.c - 664 sys sys 944961025 4438
 sys/src/cmd/mk/word.c - 664 sys sys 944961025 2595
-sys/src/cmd/mk/xyz - 775 sys sys 1055698814 134938
 sys/src/cmd/mkdir.c - 664 sys sys 1014926614 422
 sys/src/cmd/mkfile - 664 sys sys 1045534751 2205
 sys/src/cmd/mklib - 664 sys sys 1022112159 599
@@ -9326,7 +9325,7 @@ sys/src/cmd/mv.c - 664 sys sys 1014926695 4276
 sys/src/cmd/ndb - 20000000775 sys sys 988249988 0
 sys/src/cmd/ndb/convDNS2M.c - 664 sys sys 1021579991 6525
 sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1050714836 6740
-sys/src/cmd/ndb/cs.c - 664 sys sys 1055701923 32739
+sys/src/cmd/ndb/cs.c - 664 sys sys 1056171180 32752
 sys/src/cmd/ndb/csgetval.c - 664 sys sys 957402051 1051
 sys/src/cmd/ndb/csquery.c - 664 sys sys 1014926159 1062
 sys/src/cmd/ndb/dblookup.c - 664 sys sys 1055701929 17465
@@ -9339,7 +9338,7 @@ sys/src/cmd/ndb/dns.h - 664 sys sys 1055701923 8875
 sys/src/cmd/ndb/dnsdebug.c - 664 sys sys 1055701923 8359
 sys/src/cmd/ndb/dnserver.c - 664 sys sys 1021579994 3687
 sys/src/cmd/ndb/dnsquery.c - 664 sys sys 1014926160 2108
-sys/src/cmd/ndb/dnstcp.c - 664 sys sys 1024158822 7040
+sys/src/cmd/ndb/dnstcp.c - 664 sys sys 1056171180 7066
 sys/src/cmd/ndb/dnudpserver.c - 664 sys sys 1055701924 5277
 sys/src/cmd/ndb/ipquery.c - 664 sys sys 960335375 760
 sys/src/cmd/ndb/mkdb.c - 664 sys sys 957402054 2886

+ 5 - 0
dist/replica/plan9.log

@@ -12340,3 +12340,8 @@
 1056155485 0 c sys/src/cmd/upas/fs/imap4.c - 664 sys sys 1056155537 16374
 1056155485 1 c sys/src/cmd/upas/fs/pop3.c - 664 sys sys 1056155538 11716
 1056164491 0 c sys/src/cmd/unix/u9fs/u9fs.c - 664 sys sys 1056163716 30830
+1056171697 0 c sys/src/9/alphapc/apc - 664 sys sys 1056171197 624
+1056171697 1 c sys/src/9/alphapc/apccpu - 664 sys sys 1056171198 510
+1056171697 2 c sys/src/cmd/ndb/cs.c - 664 sys sys 1056171180 32752
+1056171697 3 c sys/src/cmd/ndb/dnstcp.c - 664 sys sys 1056171180 7066
+1056214978 0 d sys/src/cmd/mk/xyz - 775 sys sys 1055698814 0

+ 3 - 2
sys/src/9/alphapc/apc

@@ -62,5 +62,6 @@ boot
 bootdir
 	bootapc.out boot
 	/alpha/bin/disk/kfs
-	factotum.hack factotum
-	ipconfig.hack ipconfig
+	/alpha/bin/auth/factotum
+	/alpha/bin/ip/ipconfig
+

+ 3 - 2
sys/src/9/alphapc/apccpu

@@ -54,6 +54,7 @@ boot cpu
 
 bootdir
 	bootapccpu.out boot
-	ipconfig.hack ipconfig
-	factotum.hack factotum
+	/alpha/bin/ip/ipconfig
+	/alpha/bin/auth/factotum
+
 

+ 18 - 14
sys/src/cmd/ndb/cs.c

@@ -920,23 +920,27 @@ isvalidip(uchar *ip)
 	return ipcmp(ip, IPnoaddr) != 0 && ipcmp(ip, v4prefix) != 0;
 }
 
+static uchar loopbacknet[IPaddrlen] = {
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+	0, 0, 0xff, 0xff,
+	127, 0, 0, 0
+};
+static uchar loopbackmask[IPaddrlen] = {
+	0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff,
+	0xff, 0, 0, 0
+};
+
 void
 readipinterfaces(void)
 {
-	Ipifc *nifc;
-	Iplifc *lifc;
-
-	ipifcs = readipifc(mntpt, ipifcs, -1);
-	for(nifc = ipifcs; nifc; nifc = nifc->next)
-		for(lifc = nifc->lifc; lifc; lifc = lifc->next)
-			if(ipcmp(lifc->ip, IPnoaddr) != 0){
-				ipmove(ipa, lifc->ip);
-				sprint(ipaddr, "%I", ipa);
-				if(debug)
-					syslog(0, "dns", "ipaddr is %s\n", ipaddr);
-				return;
-			}
-	ipmove(ipa, IPnoaddr);
+	if(myipaddr(ipa, mntpt) != 0)
+		ipmove(ipa, IPnoaddr);
+	sprint(ipaddr, "%I", ipa);
+	if (debug)
+		syslog(0, "dns", "ipaddr is %s\n", ipaddr);
 }
 
 /*

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

@@ -21,6 +21,7 @@ ulong	now;
 int	maxage;
 uchar	ipaddr[IPaddrlen];	/* my ip address */
 char	*LOG;
+char	*zonerefreshprogram;
 
 static int	readmsg(int, uchar*, int);
 static void	reply(int, DNSmsg*, Request*);