src/usr.bin/ssh/ssh_config.5 - diff

Return to ssh_config.5 CVS log

Up to [local] / src / usr.bin / ssh

-version 1.94, 2006/05/29 16:10:03
+version 1.95, 2006/07/02 17:12:58
 Line 931
 Line 931
 Line 931
  To disable TCP keepalive messages, the value should be set to
  .Dq no .
  .It Cm Tunnel
- Request starting
+ Request
  .Xr tun 4
  device forwarding between the client and the server.
- This option also allows requesting layer 2 (ethernet)
- instead of layer 3 (point-to-point) tunneling from the server.
  The argument must be
  .Dq yes ,
- .Dq point-to-point ,
+ .Dq point-to-point
- .Dq ethernet ,
+ (layer 3),
+ .Dq ethernet
+ (layer 2),
  or
  .Dq no .
+ Specifying
+ .Dq yes
+ requests the default tunnel mode, which is
+ .Dq point-to-point .
  The default is
  .Dq no .
  .It Cm TunnelDevice
- Force a specified
+ Specifies the
  .Xr tun 4
- device on the client.
+ devices to open on the client
- Without this option, the next available device will be used.
+ .Pq Ar local_tun
+ and the server
+ .Pq Ar remote_tun .
+ .Pp
+ The argument must be
+ .Sm off
+ .Ar local_tun Op : Ar remote_tun .
+ .Sm on
+ The devices may be specified by numerical ID or the keyword
+ .Dq any ,
+ which uses the next available tunnel device.
+ If
+ .Ar remote_tun
+ is not specified, it defaults to
+ .Dq any .
+ The default is
+ .Dq any:any .
  .It Cm UsePrivilegedPort
  Specifies whether to use a privileged port for outgoing connections.
  The argument must be