Browse Source

Plan 9 from Bell Labs 2007-06-21

David du Colombier 12 years ago
parent
commit
1a604193b8
6 changed files with 38 additions and 19 deletions
  1. 3 3
      dist/replica/_plan9.db
  2. 3 3
      dist/replica/plan9.db
  3. 3 0
      dist/replica/plan9.log
  4. 25 11
      sys/man/3/bridge
  5. 2 0
      sys/man/3/vga
  6. 2 2
      sys/src/9/ip/ethermedium.c

+ 3 - 3
dist/replica/_plan9.db

@@ -7633,7 +7633,7 @@ sys/man/3/INDEX.html - 664 sys sys 1104736377 3590
 sys/man/3/apm - 664 sys sys 984709634 1625
 sys/man/3/arch - 664 sys sys 958419692 1425
 sys/man/3/audio - 664 sys sys 1133880494 2933
-sys/man/3/bridge - 664 sys sys 1178574591 2921
+sys/man/3/bridge - 664 sys sys 1182317237 3151
 sys/man/3/cap - 664 sys sys 1032632323 2137
 sys/man/3/cons - 664 sys sys 1133880397 8972
 sys/man/3/draw - 664 sys sys 1040457030 13813
@@ -7662,7 +7662,7 @@ sys/man/3/ssl - 664 sys sys 1018386776 3413
 sys/man/3/tls - 664 sys sys 1045501496 7018
 sys/man/3/uart - 664 sys sys 1138191356 2003
 sys/man/3/usb - 664 sys sys 1167774741 7052
-sys/man/3/vga - 664 sys sys 1131301005 4957
+sys/man/3/vga - 664 sys sys 1182367669 4987
 sys/man/4 - 20000000775 sys sys 1128556957 0
 sys/man/4/0intro - 664 sys sys 944959699 472
 sys/man/4/INDEX - 664 sys sys 1178249215 1026
@@ -7962,7 +7962,7 @@ sys/src/9/ip/chandial.c - 664 sys sys 1099020048 2295
 sys/src/9/ip/devip.c - 664 sys sys 1161061185 24242
 sys/src/9/ip/eipconvtest.c - 664 sys sys 1022588098 3135
 sys/src/9/ip/esp.c - 664 sys sys 1047260561 17084
-sys/src/9/ip/ethermedium.c - 664 sys sys 1115565973 15592
+sys/src/9/ip/ethermedium.c - 664 sys sys 1182317888 15596
 sys/src/9/ip/gre.c - 664 sys sys 1115566178 5069
 sys/src/9/ip/icmp.c - 664 sys sys 1134390100 9496
 sys/src/9/ip/icmp6.c - 664 sys sys 1179511008 18019

+ 3 - 3
dist/replica/plan9.db

@@ -7633,7 +7633,7 @@ sys/man/3/INDEX.html - 664 sys sys 1104736377 3590
 sys/man/3/apm - 664 sys sys 984709634 1625
 sys/man/3/arch - 664 sys sys 958419692 1425
 sys/man/3/audio - 664 sys sys 1133880494 2933
-sys/man/3/bridge - 664 sys sys 1178574591 2921
+sys/man/3/bridge - 664 sys sys 1182317237 3151
 sys/man/3/cap - 664 sys sys 1032632323 2137
 sys/man/3/cons - 664 sys sys 1133880397 8972
 sys/man/3/draw - 664 sys sys 1040457030 13813
@@ -7662,7 +7662,7 @@ sys/man/3/ssl - 664 sys sys 1018386776 3413
 sys/man/3/tls - 664 sys sys 1045501496 7018
 sys/man/3/uart - 664 sys sys 1138191356 2003
 sys/man/3/usb - 664 sys sys 1167774741 7052
-sys/man/3/vga - 664 sys sys 1131301005 4957
+sys/man/3/vga - 664 sys sys 1182367669 4987
 sys/man/4 - 20000000775 sys sys 1128556957 0
 sys/man/4/0intro - 664 sys sys 944959699 472
 sys/man/4/INDEX - 664 sys sys 1178249215 1026
@@ -7962,7 +7962,7 @@ sys/src/9/ip/chandial.c - 664 sys sys 1099020048 2295
 sys/src/9/ip/devip.c - 664 sys sys 1161061185 24242
 sys/src/9/ip/eipconvtest.c - 664 sys sys 1022588098 3135
 sys/src/9/ip/esp.c - 664 sys sys 1047260561 17084
-sys/src/9/ip/ethermedium.c - 664 sys sys 1115565973 15592
+sys/src/9/ip/ethermedium.c - 664 sys sys 1182317888 15596
 sys/src/9/ip/gre.c - 664 sys sys 1115566178 5069
 sys/src/9/ip/icmp.c - 664 sys sys 1134390100 9496
 sys/src/9/ip/icmp6.c - 664 sys sys 1179511008 18019

+ 3 - 0
dist/replica/plan9.log

@@ -49276,3 +49276,6 @@
 1182227423 0 c sys/src/cmd/ndb/cs.c - 664 sys sys 1182226496 33117
 1182276022 0 c sys/src/cmd/ndb/cs.c - 664 sys sys 1182275681 33213
 1182283224 0 c 386/bin/ndb/cs - 775 sys sys 1182283129 149052
+1182317423 0 c sys/man/3/bridge - 664 sys sys 1182317237 3151
+1182319223 0 c sys/src/9/ip/ethermedium.c - 664 sys sys 1182317888 15596
+1182367845 0 c sys/man/3/vga - 664 sys sys 1182367669 4987

+ 25 - 11
sys/man/3/bridge

@@ -1,6 +1,6 @@
-.TH BRIDGE 3 
+.TH BRIDGE 3
 .SH NAME
-bridge \- IPv4 network bridge
+bridge \- IPv4 Ethernet bridge
 .SH SYNOPSIS
 .nf
 .B bind -a #B\fIb\fP /net
@@ -9,7 +9,7 @@ bridge \- IPv4 network bridge
 .B /net/bridge\fIb\fP/cache
 .B /net/bridge\fIb\fP/log
 .B /net/bridge\fIb\fP/stats
-.BI /net/bridge\fIb\fP/ n 
+.BI /net/bridge\fIb\fP/ n
 .BI /net/bridge\fIb\fP/ n /ctl
 .BI /net/bridge\fIb\fP/ n /local
 .BI /net/bridge\fIb\fP/ n /status
@@ -18,7 +18,8 @@ bridge \- IPv4 network bridge
 The
 .I bridge
 device implements bridging of IPv4 packets
-amongst network interfaces.
+amongst Ethernet interfaces.
+The number
 .I b
 in the bind is optional and selects a particular bridge
 (default 0).
@@ -53,19 +54,32 @@ messages are:
 .TF cacheflush
 .PD
 .TP
-.BI "bind ether " "name ownhash path [path2]"
+.BI "bind ether " "name ownhash path"
 Treat the device mounted at
 .I path
+(e.g.,
+.LR /net/ether0 )
 as an Ethernet medium carrying IPv4 and ARP packets
 and associate it with this bridge (forward its packets to the
 other interfaces associated with this bridge).
+.I Ownhash
+is an `owner hash'.
 .TP
-.BI "bind tunnel " "name ownhash path [path2]"
+.BI "bind tunnel " "name ownhash path path2
 Treat the device mounted at
 .I path
-as a network tunnel carrying IPv4 and ARP packets
-and associate it with this bridge (forward its packets to the
+as a network tunnel carrying IPv4 and ARP packets,
+the device mounted at
+.I path2
+as an Ethernet medium carrying IPv4 and ARP packets
+and associate them with this bridge
+(forward its packets to the
 other interfaces associated with this bridge).
+Read packets from the
+.I path
+interface and write them to the
+.I path2
+interface.
 .TP
 .BI "unbind " "type address [ownhash]"
 Disassociate the interface associated with
@@ -84,7 +98,7 @@ Clear the cache of (IP addresses, destination MAC address, port) tuples.
 Set the
 .I delay0
 and
-.I delayn 
+.I delayn
 parameters.
 .I delay0
 is the constant microsecond delay per packet
@@ -98,7 +112,7 @@ Set bridge
 The only known option is
 .LR tcpmss ,
 which limits the TCP Maximum Segment Size of
-packets passing through to 1300 bytes.
+TCPv4 packets passing through to 1300 bytes.
 .TP
 .BI "clear " option
 Clear bridge
@@ -143,4 +157,4 @@ echo 'bind ether inner 0 /net/ether1' >/net/bridge0/ctl
 .SH SOURCE
 .B /sys/src/9/port/devbridge.c
 .SH BUGS
-Doesn't work with IPv6.
+Doesn't understand IPv6.

+ 2 - 0
sys/man/3/vga

@@ -92,6 +92,7 @@ is one of
 .BR mach64xx ,
 .BR mga2164w ,
 .BR neomagic ,
+.BR nvidia ,
 .BR s3 ,
 and
 .BR t2r4 .
@@ -119,6 +120,7 @@ is one of
 .BR mach64xxhwgc ,
 .BR mga2164whwgc ,
 .BR neomagichwgc ,
+.BR nvidiahwgc ,
 .BR rgb524hwgc ,
 .BR s3hwgc ,
 .BR t2r4hwgc ,

+ 2 - 2
sys/src/9/ip/ethermedium.c

@@ -156,7 +156,7 @@ etherbind(Ipifc *ifc, int argc, char **argv)
 	}
 
 	/*
-	 *  open ip converstation
+	 *  open ipv4 converstation
 	 *
 	 *  the dial will fail if the type is already open on
 	 *  this device.
@@ -204,7 +204,7 @@ etherbind(Ipifc *ifc, int argc, char **argv)
 	achan = chandial(addr, nil, nil, nil);
 
 	/*
-	 *  open ip conversation
+	 *  open ipv6 conversation
 	 *
 	 *  the dial will fail if the type is already open on
 	 *  this device.