Browse Source

Plan 9 from Bell Labs 2005-11-28

David du Colombier 15 years ago
parent
commit
b9738980e0
6 changed files with 25 additions and 12 deletions
  1. 3 3
      dist/replica/_plan9.db
  2. 3 3
      dist/replica/plan9.db
  3. 3 0
      dist/replica/plan9.log
  4. 7 3
      lib/ndb/common
  5. 8 2
      sys/src/9/pc/sdmylex.c
  6. 1 1
      sys/src/cmd/upas/fs/imap4.c

+ 3 - 3
dist/replica/_plan9.db

@@ -5180,7 +5180,7 @@ lib/namespace.ftp - 664 sys sys 1020313578 373
 lib/namespace.httpd - 664 sys sys 984695868 1209
 lib/ndb - 20000000775 sys sys 959260770 0
 lib/ndb/auth - 664 sys sys 1117108784 572
-lib/ndb/common - 664 sys sys 1091203571 5285
+lib/ndb/common - 664 sys sys 1133147947 5356
 lib/ndb/consoledb - 664 sys sys 960222421 95
 lib/ndb/dhcp - 20000000775 sys sys 959260749 0
 lib/ndb/dnsdump - 664 sys sys 1032057649 61
@@ -8004,7 +8004,7 @@ sys/src/9/pc/sd53c8xx.c - 664 sys sys 1131538448 55207
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657
 sys/src/9/pc/sdata.c - 664 sys sys 1131290578 52168
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1131290638 25780
-sys/src/9/pc/sdmylex.c - 664 sys sys 1131290583 27737
+sys/src/9/pc/sdmylex.c - 664 sys sys 1133068062 27806
 sys/src/9/pc/sdscsi.c - 664 sys sys 1131293342 7133
 sys/src/9/pc/trap.c - 664 sys sys 1132341484 21278
 sys/src/9/pc/uarti8250.c - 664 sys sys 1102820421 13958
@@ -13347,7 +13347,7 @@ sys/src/cmd/upas/filterkit/token.c - 664 sys sys 1018549521 1312
 sys/src/cmd/upas/fs - 20000000775 sys sys 988250018 0
 sys/src/cmd/upas/fs/dat.h - 664 sys sys 1047490337 4267
 sys/src/cmd/upas/fs/fs.c - 664 sys sys 1107880276 27460
-sys/src/cmd/upas/fs/imap4.c - 664 sys sys 1121865168 16259
+sys/src/cmd/upas/fs/imap4.c - 664 sys sys 1133147970 16258
 sys/src/cmd/upas/fs/mbox.c - 664 sys sys 1107835226 28935
 sys/src/cmd/upas/fs/mkfile - 664 sys sys 1047490336 321
 sys/src/cmd/upas/fs/plan9.c - 664 sys sys 1071334861 7465

+ 3 - 3
dist/replica/plan9.db

@@ -5180,7 +5180,7 @@ lib/namespace.ftp - 664 sys sys 1020313578 373
 lib/namespace.httpd - 664 sys sys 984695868 1209
 lib/ndb - 20000000775 sys sys 959260770 0
 lib/ndb/auth - 664 sys sys 1117108784 572
-lib/ndb/common - 664 sys sys 1091203571 5285
+lib/ndb/common - 664 sys sys 1133147947 5356
 lib/ndb/consoledb - 664 sys sys 960222421 95
 lib/ndb/dhcp - 20000000775 sys sys 959260749 0
 lib/ndb/dnsdump - 664 sys sys 1032057649 61
@@ -8004,7 +8004,7 @@ sys/src/9/pc/sd53c8xx.c - 664 sys sys 1131538448 55207
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657
 sys/src/9/pc/sdata.c - 664 sys sys 1131290578 52168
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1131290638 25780
-sys/src/9/pc/sdmylex.c - 664 sys sys 1131290583 27737
+sys/src/9/pc/sdmylex.c - 664 sys sys 1133068062 27806
 sys/src/9/pc/sdscsi.c - 664 sys sys 1131293342 7133
 sys/src/9/pc/trap.c - 664 sys sys 1132341484 21278
 sys/src/9/pc/uarti8250.c - 664 sys sys 1102820421 13958
@@ -13347,7 +13347,7 @@ sys/src/cmd/upas/filterkit/token.c - 664 sys sys 1018549521 1312
 sys/src/cmd/upas/fs - 20000000775 sys sys 988250018 0
 sys/src/cmd/upas/fs/dat.h - 664 sys sys 1047490337 4267
 sys/src/cmd/upas/fs/fs.c - 664 sys sys 1107880276 27460
-sys/src/cmd/upas/fs/imap4.c - 664 sys sys 1121865168 16259
+sys/src/cmd/upas/fs/imap4.c - 664 sys sys 1133147970 16258
 sys/src/cmd/upas/fs/mbox.c - 664 sys sys 1107835226 28935
 sys/src/cmd/upas/fs/mkfile - 664 sys sys 1047490336 321
 sys/src/cmd/upas/fs/plan9.c - 664 sys sys 1071334861 7465

+ 3 - 0
dist/replica/plan9.log

@@ -23246,3 +23246,6 @@
 1132950760 3 c 386/bin/snapfs - 775 sys sys 1132950494 382806
 1132950760 4 c 386/bin/tprof - 775 sys sys 1132950495 297591
 1132950760 5 c 386/lib/libmach.a - 664 sys sys 1132950497 783518
+1133116241 0 c sys/src/9/pc/sdmylex.c - 664 sys sys 1133068062 27806
+1133148645 0 c lib/ndb/common - 664 sys sys 1133147947 5356
+1133148645 1 c sys/src/cmd/upas/fs/imap4.c - 664 sys sys 1133147970 16258

+ 7 - 3
lib/ndb/common

@@ -136,6 +136,7 @@ tcp=uucp-path port=117
 tcp=nntp port=119
 tcp=netbios port=139
 tcp=imap4 port=143
+tcp=imap port=143
 tcp=NeWS port=144
 tcp=print-srv port=170
 tcp=z39.50 port=210
@@ -159,7 +160,6 @@ tcp=9fs port=564
 tcp=whoami port=565
 tcp=guard port=566
 tcp=ticket port=567
-tcp=dlsftp port=666
 tcp=fmclient port=729
 tcp=imaps port=993
 tcp=pop3s port=995
@@ -168,6 +168,8 @@ tcp=pptp port=1723
 tcp=nfs port=2049
 tcp=webster port=2627
 tcp=weather port=3000
+tcp=sip port=5060
+tcp=sips port=5061
 tcp=secstore port=5356
 tcp=vnc-http port=5800
 tcp=vnc port=5900
@@ -197,7 +199,6 @@ tcp=glenglenda8 port=17027
 tcp=glenglenda9 port=17028
 tcp=glenglenda10 port=17029
 tcp=flyboy port=17032
-tcp=dlsftp port=17033
 tcp=venti port=17034
 tcp=wiki port=17035
 tcp=vica port=17036
@@ -212,13 +213,16 @@ udp=bootp port=67
 udp=domain port=53
 udp=dns port=53
 udp=portmap port=111
-udp=netbios-ns port=137
 udp=ntp port=123
+udp=netbios-ns port=137
 udp=snmp port=161
 udp=rip port=520
+udp=dhcp6c port=546
+udp=dhcp6s port=547
 udp=nfs port=2049
 udp=bfs port=2201
 udp=virgil port=2202
+udp=sip port=5060
 udp=bandt2 port=7331
 udp=oradius port=1645
 udp=dhash port=11977

+ 8 - 2
sys/src/9/pc/sdmylex.c

@@ -368,7 +368,10 @@ mylex24rio(SDreq* r)
 	ccb->datalen[0] = n>>16;
 	ccb->datalen[1] = n>>8;
 	ccb->datalen[2] = n;
-	p = PADDR(data);
+	if(data == nil)
+		p = 0;
+	else
+		p = PADDR(data);
 	ccb->dataptr[0] = p>>16;
 	ccb->dataptr[1] = p>>8;
 	ccb->dataptr[2] = p;
@@ -586,7 +589,10 @@ mylex32rio(SDreq* r)
 	ccb->datalen[1] = n>>8;
 	ccb->datalen[2] = n>>16;
 	ccb->datalen[3] = n>>24;
-	p = PADDR(r->data);
+	if(r->data == nil)
+		p = 0;
+	else
+		p = PADDR(r->data);
 	ccb->dataptr[0] = p;
 	ccb->dataptr[1] = p>>8;
 	ccb->dataptr[2] = p>>16;

+ 1 - 1
sys/src/cmd/upas/fs/imap4.c

@@ -431,7 +431,7 @@ imap4dial(Imap *imap)
 	if(imap->mustssl)
 		port = "imaps";
 	else
-		port = "imap4";
+		port = "imap";
 
 	if((imap->fd = dial(netmkaddr(imap->host, "net", port), 0, 0, 0)) < 0)
 		return geterrstr();