summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-08 18:54:17 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-08 18:54:17 +1100
commitf2705c8b7d0b6a9cc33c244bdf041f2a1087e08a (patch)
treeeadf0742a6466316553263f6ebbe64a5296ecaaf
parentb8c884a0ba4050e4267be786414127c0f09d5544 (diff)
- djm@cvs.openbsd.org 2009/12/20 23:20:40
[PROTOCOL] fix an incorrect magic number and typo in PROTOCOL; bz#1688 report and fix from ueno AT unixuser.org
-rw-r--r--ChangeLog4
-rw-r--r--PROTOCOL12
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 605e0dca7..ce5cd8b89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,6 +119,10 @@
119 filenames that start with a '-'. 119 filenames that start with a '-'.
120 Based on a diff by halex@ 120 Based on a diff by halex@
121 ok halex@ djm@ deraadt@ 121 ok halex@ djm@ deraadt@
122 - djm@cvs.openbsd.org 2009/12/20 23:20:40
123 [PROTOCOL]
124 fix an incorrect magic number and typo in PROTOCOL; bz#1688
125 report and fix from ueno AT unixuser.org
122 126
12320091226 12720091226
124 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 128 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/PROTOCOL b/PROTOCOL
index 5aada630d..c4fd57062 100644
--- a/PROTOCOL
+++ b/PROTOCOL
@@ -121,10 +121,10 @@ layer 2 frames or layer 3 packets. It may take one of the following values:
121 SSH_TUNMODE_ETHERNET 2 /* layer 2 frames */ 121 SSH_TUNMODE_ETHERNET 2 /* layer 2 frames */
122 122
123The "tunnel unit number" specifies the remote interface number, or may 123The "tunnel unit number" specifies the remote interface number, or may
124be zero to allow the server to automatically chose an interface. A server 124be 0x7fffffff to allow the server to automatically chose an interface. A
125that is not willing to open a client-specified unit should refuse the 125server that is not willing to open a client-specified unit should refuse
126request with a SSH_MSG_CHANNEL_OPEN_FAILURE error. On successful open, 126the request with a SSH_MSG_CHANNEL_OPEN_FAILURE error. On successful
127the server should reply with SSH_MSG_CHANNEL_OPEN_SUCCESS. 127open, the server should reply with SSH_MSG_CHANNEL_OPEN_SUCCESS.
128 128
129Once established the client and server may exchange packet or frames 129Once established the client and server may exchange packet or frames
130over the tunnel channel by encapsulating them in SSH protocol strings 130over the tunnel channel by encapsulating them in SSH protocol strings
@@ -151,7 +151,7 @@ It may be one of:
151The "packet data" field consists of the IPv4/IPv6 datagram itself 151The "packet data" field consists of the IPv4/IPv6 datagram itself
152without any link layer header. 152without any link layer header.
153 153
154The contents of the "data" field for layer 3 packets is: 154The contents of the "data" field for layer 2 packets is:
155 155
156 uint32 packet length 156 uint32 packet length
157 byte[packet length] frame 157 byte[packet length] frame
@@ -251,4 +251,4 @@ The values of the f_flag bitmask are as follows:
251Both the "statvfs@openssh.com" and "fstatvfs@openssh.com" extensions are 251Both the "statvfs@openssh.com" and "fstatvfs@openssh.com" extensions are
252advertised in the SSH_FXP_VERSION hello with version "2". 252advertised in the SSH_FXP_VERSION hello with version "2".
253 253
254$OpenBSD: PROTOCOL,v 1.12 2009/02/14 06:35:49 djm Exp $ 254$OpenBSD: PROTOCOL,v 1.13 2009/12/20 23:20:40 djm Exp $