diff options
author | Damien Miller <djm@mindrot.org> | 2012-06-20 21:51:29 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-06-20 21:51:29 +1000 |
commit | 7f12157c0a27abe045eaad92b6a2de9ca50a340b (patch) | |
tree | d788b7e4b28e56b600e124b4121ab6f736aab537 | |
parent | 3bde12aeef60c9e1221316aff1fe1aca78eca027 (diff) |
- djm@cvs.openbsd.org 2012/06/01 00:49:35
[PROTOCOL.mux]
correct types of port numbers (integers, not strings); bz#2004 from
bert.wesarg AT googlemail.com
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | PROTOCOL.mux | 10 |
2 files changed, 9 insertions, 5 deletions
@@ -20,6 +20,10 @@ | |||
20 | [dns.c dns.h key.c key.h ssh-keygen.c] | 20 | [dns.c dns.h key.c key.h ssh-keygen.c] |
21 | add support for RFC6594 SSHFP DNS records for ECDSA key types. | 21 | add support for RFC6594 SSHFP DNS records for ECDSA key types. |
22 | patch from bugzilla-m67 AT nulld.me in bz#1978; ok + tweak markus@ | 22 | patch from bugzilla-m67 AT nulld.me in bz#1978; ok + tweak markus@ |
23 | - djm@cvs.openbsd.org 2012/06/01 00:49:35 | ||
24 | [PROTOCOL.mux] | ||
25 | correct types of port numbers (integers, not strings); bz#2004 from | ||
26 | bert.wesarg AT googlemail.com | ||
23 | 27 | ||
24 | 20120519 | 28 | 20120519 |
25 | - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch | 29 | - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch |
diff --git a/PROTOCOL.mux b/PROTOCOL.mux index 49cbe5b45..b5832561c 100644 --- a/PROTOCOL.mux +++ b/PROTOCOL.mux | |||
@@ -110,9 +110,9 @@ A client may request the master to establish a port forward: | |||
110 | uint32 request id | 110 | uint32 request id |
111 | uint32 forwarding type | 111 | uint32 forwarding type |
112 | string listen host | 112 | string listen host |
113 | string listen port | 113 | uint32 listen port |
114 | string connect host | 114 | string connect host |
115 | string connect port | 115 | uint32 connect port |
116 | 116 | ||
117 | forwarding type may be MUX_FWD_LOCAL, MUX_FWD_REMOTE, MUX_FWD_DYNAMIC. | 117 | forwarding type may be MUX_FWD_LOCAL, MUX_FWD_REMOTE, MUX_FWD_DYNAMIC. |
118 | 118 | ||
@@ -135,9 +135,9 @@ A client may request the master to close a port forward: | |||
135 | uint32 request id | 135 | uint32 request id |
136 | uint32 forwarding type | 136 | uint32 forwarding type |
137 | string listen host | 137 | string listen host |
138 | string listen port | 138 | uint32 listen port |
139 | string connect host | 139 | string connect host |
140 | string connect port | 140 | uint32 connect port |
141 | 141 | ||
142 | A server may reply with a MUX_S_OK, a MUX_S_PERMISSION_DENIED or a | 142 | A server may reply with a MUX_S_OK, a MUX_S_PERMISSION_DENIED or a |
143 | MUX_S_FAILURE. | 143 | MUX_S_FAILURE. |
@@ -219,4 +219,4 @@ XXX inject packet (what about replies) | |||
219 | XXX server->client error/warning notifications | 219 | XXX server->client error/warning notifications |
220 | XXX send signals via mux | 220 | XXX send signals via mux |
221 | 221 | ||
222 | $OpenBSD: PROTOCOL.mux,v 1.8 2011/09/09 00:44:07 djm Exp $ | 222 | $OpenBSD: PROTOCOL.mux,v 1.9 2012/06/01 00:49:35 djm Exp $ |