Plan 9 from Bell Labs 2004-09-03

dist/replica/_plan9.db

@@ -437,7 +437,7 @@
 386/bin/upas/mlowner - 775 sys sys 1085077113 90099
 386/bin/upas/msgcat - 775 sys sys 1064598353 38
 386/bin/upas/msgtok - 775 sys sys 1064598354 75149
-386/bin/upas/nedmail - 775 sys sys 1093489559 153913
+386/bin/upas/nedmail - 775 sys sys 1094094462 154219
 386/bin/upas/pop3 - 775 sys sys 1085077114 259808
 386/bin/upas/qer - 775 sys sys 1085077114 97840
 386/bin/upas/ratfs - 775 sys sys 1089257539 109406
@@ -5099,7 +5099,7 @@ sys/man/8/stub - 664 sys sys 1044830500 943
 sys/man/8/swap - 664 sys sys 944959679 880
 sys/man/8/timesync - 664 sys sys 1022590210 1629
 sys/man/8/tlssrv - 664 sys sys 1037580152 2594
-sys/man/8/trampoline - 664 sys sys 1081200125 0
+sys/man/8/trampoline - 664 sys sys 1094150519 1073
 sys/man/8/udpecho - 664 sys sys 954305553 303
 sys/man/8/update - 664 sys sys 961259288 2336
 sys/man/8/venti - 664 sys sys 1069101926 5422
@@ -9598,7 +9598,7 @@ sys/src/cmd/lex/ncform - 664 sys sys 944961017 4060
 sys/src/cmd/lex/parser.y - 664 sys sys 1063855045 14194
 sys/src/cmd/lex/sub1.c - 664 sys sys 1063855044 9784
 sys/src/cmd/lex/sub2.c - 664 sys sys 944961016 17125
-sys/src/cmd/lnfs.c - 664 sys sys 1033565778 13330
+sys/src/cmd/lnfs.c - 664 sys sys 1094156765 13332
 sys/src/cmd/look.c - 664 sys sys 944961619 5994
 sys/src/cmd/lp - 20000000775 sys sys 953344617 0
 sys/src/cmd/lp/LOCK.c - 664 sys sys 1015090023 1066
@@ -9733,7 +9733,7 @@ sys/src/cmd/netstat.c - 664 sys sys 1078839959 3846
 sys/src/cmd/news.c - 664 sys sys 1014926614 3778
 sys/src/cmd/nfs.c - 664 sys sys 1050068720 31096
 sys/src/cmd/nm.c - 664 sys sys 1073313392 4912
-sys/src/cmd/nntpfs.c - 664 sys sys 1055699250 18903
+sys/src/cmd/nntpfs.c - 664 sys sys 1094156765 18904
 sys/src/cmd/ns.c - 664 sys sys 984717934 3558
 sys/src/cmd/p.c - 664 sys sys 1043516305 1497
 sys/src/cmd/page - 20000000775 sys sys 956344628 0
@@ -10366,7 +10366,7 @@ sys/src/cmd/ssh/cmsg.c - 664 sys sys 1071095546 8351
 sys/src/cmd/ssh/mkfile - 664 sys sys 1048179592 1045
 sys/src/cmd/ssh/msg.c - 664 sys sys 1092516579 8102
 sys/src/cmd/ssh/pubkey.c - 664 sys sys 1019928902 3974
-sys/src/cmd/ssh/scp.c - 664 sys sys 1075130172 13886
+sys/src/cmd/ssh/scp.c - 664 sys sys 1094156297 13889
 sys/src/cmd/ssh/smsg.c - 664 sys sys 1092516575 6374
 sys/src/cmd/ssh/ssh.c - 664 sys sys 1066515693 9667
 sys/src/cmd/ssh/ssh.h - 664 sys sys 1091904420 6086
@@ -12337,4 +12337,6 @@ usr/glenda/lib/profile - 664 glenda glenda 1021580005 847
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-386/bin/upas/nedmail - 775 sys sys 1094094462 154219
+386/bin/lnfs - 775 sys sys 1094180929 97410
+386/bin/nntpfs - 775 sys sys 1094180930 158833
+386/bin/scp - 775 sys sys 1094180930 149872

dist/replica/plan9.db

@@ -298,7 +298,7 @@
 386/bin/ktrace - 775 sys sys 1091936093 111408
 386/bin/lens - 775 sys sys 1085077076 122322
 386/bin/lex - 775 sys sys 1085077076 96662
-386/bin/lnfs - 775 sys sys 1085077076 97466
+386/bin/lnfs - 775 sys sys 1094180929 97410
 386/bin/look - 775 sys sys 1085077077 63516
 386/bin/ls - 775 sys sys 1088823722 80345
 386/bin/mc - 775 sys sys 1085077077 130848
@@ -329,7 +329,7 @@
 386/bin/news - 775 sys sys 1085077084 69654
 386/bin/nfs - 775 sys sys 1089397314 313346
 386/bin/nm - 775 sys sys 1091936093 113471
-386/bin/nntpfs - 775 sys sys 1089397315 158830
+386/bin/nntpfs - 775 sys sys 1094180930 158833
 386/bin/ns - 775 sys sys 1085077086 63226
 386/bin/p - 775 sys sys 1085077086 62948
 386/bin/page - 775 sys sys 1087442536 229962
@@ -370,7 +370,7 @@
 386/bin/rx - 775 sys sys 1085077094 79893
 386/bin/sam - 775 sys sys 1085077095 155916
 386/bin/scat - 775 sys sys 1085077095 281706
-386/bin/scp - 775 sys sys 1092539157 149860
+386/bin/scp - 775 sys sys 1094180930 149872
 386/bin/scuzz - 775 sys sys 1085077096 109619
 386/bin/sed - 775 sys sys 1085077096 87471
 386/bin/seq - 775 sys sys 1085077096 38178
@@ -5099,7 +5099,7 @@ sys/man/8/stub - 664 sys sys 1044830500 943
 sys/man/8/swap - 664 sys sys 944959679 880
 sys/man/8/timesync - 664 sys sys 1022590210 1629
 sys/man/8/tlssrv - 664 sys sys 1037580152 2594
-sys/man/8/trampoline - 664 sys sys 1081200125 0
+sys/man/8/trampoline - 664 sys sys 1094150519 1073
 sys/man/8/udpecho - 664 sys sys 954305553 303
 sys/man/8/update - 664 sys sys 961259288 2336
 sys/man/8/venti - 664 sys sys 1069101926 5422
@@ -9598,7 +9598,7 @@ sys/src/cmd/lex/ncform - 664 sys sys 944961017 4060
 sys/src/cmd/lex/parser.y - 664 sys sys 1063855045 14194
 sys/src/cmd/lex/sub1.c - 664 sys sys 1063855044 9784
 sys/src/cmd/lex/sub2.c - 664 sys sys 944961016 17125
-sys/src/cmd/lnfs.c - 664 sys sys 1033565778 13330
+sys/src/cmd/lnfs.c - 664 sys sys 1094156765 13332
 sys/src/cmd/look.c - 664 sys sys 944961619 5994
 sys/src/cmd/lp - 20000000775 sys sys 953344617 0
 sys/src/cmd/lp/LOCK.c - 664 sys sys 1015090023 1066
@@ -9733,7 +9733,7 @@ sys/src/cmd/netstat.c - 664 sys sys 1078839959 3846
 sys/src/cmd/news.c - 664 sys sys 1014926614 3778
 sys/src/cmd/nfs.c - 664 sys sys 1050068720 31096
 sys/src/cmd/nm.c - 664 sys sys 1073313392 4912
-sys/src/cmd/nntpfs.c - 664 sys sys 1055699250 18903
+sys/src/cmd/nntpfs.c - 664 sys sys 1094156765 18904
 sys/src/cmd/ns.c - 664 sys sys 984717934 3558
 sys/src/cmd/p.c - 664 sys sys 1043516305 1497
 sys/src/cmd/page - 20000000775 sys sys 956344628 0
@@ -10366,7 +10366,7 @@ sys/src/cmd/ssh/cmsg.c - 664 sys sys 1071095546 8351
 sys/src/cmd/ssh/mkfile - 664 sys sys 1048179592 1045
 sys/src/cmd/ssh/msg.c - 664 sys sys 1092516579 8102
 sys/src/cmd/ssh/pubkey.c - 664 sys sys 1019928902 3974
-sys/src/cmd/ssh/scp.c - 664 sys sys 1075130172 13886
+sys/src/cmd/ssh/scp.c - 664 sys sys 1094156297 13889
 sys/src/cmd/ssh/smsg.c - 664 sys sys 1092516575 6374
 sys/src/cmd/ssh/ssh.c - 664 sys sys 1066515693 9667
 sys/src/cmd/ssh/ssh.h - 664 sys sys 1091904420 6086

dist/replica/plan9.log

@@ -16645,3 +16645,10 @@
 1094068845 1 c sys/src/cmd/unix/u9fs/doprint.c - 664 sys sys 1094068304 8685
 1094068845 2 c sys/src/cmd/unix/u9fs/plan9.h - 664 sys sys 1094068304 5568
 1094095850 0 c 386/bin/upas/nedmail - 775 sys sys 1094094462 154219
+1094151661 0 c sys/man/8/trampoline - 664 sys sys 1094150519 1073
+1094157062 0 c sys/src/cmd/lnfs.c - 664 sys sys 1094156765 13332
+1094157062 1 c sys/src/cmd/nntpfs.c - 664 sys sys 1094156765 18904
+1094157062 2 c sys/src/cmd/ssh/scp.c - 664 sys sys 1094156297 13889
+1094182267 0 c 386/bin/lnfs - 775 sys sys 1094180929 97410
+1094182267 1 c 386/bin/nntpfs - 775 sys sys 1094180930 158833
+1094182267 2 c 386/bin/scp - 775 sys sys 1094180930 149872

sys/man/8/trampoline

@@ -0,0 +1,54 @@
+.TH TRAMPOLINE 8
+.SH NAME
+trampoline \- forward incoming calls to another address
+.SH SYNOPSIS
+.B aux/trampoline
+[
+.B -m9
+]
+.I addr
+.RI [ netdir ]
+.SH DESCRIPTION
+.I Trampoline
+can be used in a service file (see
+.IR listen (8))
+to link an incoming call to
+another address that provides the service, typically on another machine.
+.PP
+.I Trampoline
+dials
+.I addr
+and copies data between that connection
+and its own standard input and output.
+Use the
+.B -9
+option if the connection carries only unencrypted 9P messages, to allow
+.I trampoline
+to size its buffer automatically.
+.PP
+Forwarding can be restricted to a particular calling machine,
+using the
+.B -m
+option.
+.I Netdir
+must be the incoming call directory.
+.I Trampoline
+finds the caller's MAC address
+.I m
+and checks that
+.IR ndb (6)
+contains an entry with
+.BI ether= m
+and the attribute
+.BR trampok .
+If no such entry is found, the call is rejected.
+.SH FILES
+.TF /sys/log/trampoline
+.TP
+.B /sys/log/trampoline
+logs rejected calls
+.SH SOURCE
+.B /sys/src/cmd/aux/trampoline.c
+.SH SEE ALSO
+.IR dial (2),
+.IR listen (8)

sys/src/cmd/lnfs.c

@@ -135,7 +135,7 @@ main(int argc, char *argv[])
 		usage();
 	defmnt = argv[0];
 	d = dirstat(defmnt);
-	if(d == nil || d->qid.type != QTDIR)
+	if(d == nil || !(d->qid.type & QTDIR))
 		sysfatal("mountpoint must be an accessible directory");
 	free(d);
 
@@ -403,7 +403,7 @@ rread(Fid *f)
 		return Enotexist;
 	if(thdr.count > messagesize-IOHDRSZ)
 		thdr.count = messagesize-IOHDRSZ;
-	if(f->qid.type == QTDIR)
+	if(f->qid.type & QTDIR)
 		return rreaddir(f);
 	n = pread(f->fd, rdata, thdr.count, thdr.offset);
 	if(n < 0)
@@ -418,7 +418,7 @@ rwrite(Fid *f)
 {
 	long n;
 
-	if(readonly || f->qid.type == QTDIR)
+	if(readonly || (f->qid.type & QTDIR))
 		return Eperm;
 	if(f->fd < 0)
 		return Enotexist;

sys/src/cmd/nntpfs.c

@@ -903,7 +903,7 @@ fsstat(Req *r)
 	Aux *a;
 
 	a = r->fid->aux;
-	if(r->fid->qid.path == 0 && r->fid->qid.type == QTDIR)
+	if(r->fid->qid.path == 0 && (r->fid->qid.type & QTDIR))
 		nntprefreshall(net);
 	else if(a->g->isgroup)
 		nntprefresh(net, a->g);

sys/src/cmd/ssh/scp.c

@@ -14,11 +14,11 @@ isatty(int fd)
 	return 0;
 }
 
-#define	OK		0x00
+#define	OK	0x00
 #define	ERROR	0x01
 #define	FATAL	0x02
 
-char *progname;
+char	*progname;
 
 int	dflag;
 int	fflag;
@@ -28,13 +28,13 @@ int	rflag;
 int	tflag;
 int	vflag;
 
-int remote;
+int	remote;
 
-char *exitflag = nil;
+char	*exitflag = nil;
 
 void	scperror(int, char*, ...);
 void	mustbedir(char*);
-void receive(char*);
+void	receive(char*);
 char	*fileaftercolon(char*);
 void	destislocal(char *cmd, int argc, char *argv[], char *dest);
 void	destisremote(char *cmd, int argc, char *argv[], char *host, char *dest);
@@ -43,9 +43,9 @@ void	send(char*);
 void	senddir(char*, int, Dir*);
 int 	getresponse(void);
 
-char theuser[32];
+char	theuser[32];
 
-char ssh[] = "/bin/ssh";
+char	ssh[] = "/bin/ssh";
 
 int	remotefd0;
 int	remotefd1;
@@ -341,7 +341,7 @@ receivedir(char *dir, int exists, Dir *d, int settimes, ulong atime, ulong mtime
 
 	setmodes = pflag;
 	if(exists){
-		if(d->qid.type != QTDIR) {
+		if(!(d->qid.type & QTDIR)) {
 			scperror(0, "%s: protocol botch: directory requrest for non-directory", dir);
 			return d;
 		}
@@ -398,7 +398,7 @@ receive(char *dest)
 	atime = 0L;
 	settimes = 0;
 	isdir = 0;
-	if ((d = dirstat(dest)) && d->qid.type == QTDIR) {
+	if ((d = dirstat(dest)) && (d->qid.type & QTDIR)) {
 		isdir = 1;
 	}
 	if(dflag && !isdir)
@@ -568,7 +568,7 @@ send(char *file)
 		goto Return;
 	}
 
-	if(d->qid.type == QTDIR){
+	if(d->qid.type & QTDIR){
 		if(rflag)
 			senddir(file, fd, d);
 		else
@@ -793,7 +793,7 @@ mustbedir(char *file)
 		scperror(1, "%s: %r", file);
 		return;
 	}
-	if(d->qid.type != QTDIR)
+	if(!(d->qid.type & QTDIR))
 		scperror(1, "%s: Not a directory", file);
 	free(d);
 }