diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /PROTOCOL.mux | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'PROTOCOL.mux')
-rw-r--r-- | PROTOCOL.mux | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/PROTOCOL.mux b/PROTOCOL.mux index 2a5817bd7..9ad256602 100644 --- a/PROTOCOL.mux +++ b/PROTOCOL.mux | |||
@@ -73,6 +73,13 @@ non-multiplexed ssh(1) connection. Two additional cases that the | |||
73 | client must cope with are it receiving a signal itself and the | 73 | client must cope with are it receiving a signal itself and the |
74 | server disconnecting without sending an exit message. | 74 | server disconnecting without sending an exit message. |
75 | 75 | ||
76 | A master may also send a MUX_S_TTY_ALLOC_FAIL before MUX_S_EXIT_MESSAGE | ||
77 | if remote TTY allocation was unsuccessful. The client may use this to | ||
78 | return its local tty to "cooked" mode. | ||
79 | |||
80 | uint32 MUX_S_TTY_ALLOC_FAIL | ||
81 | uint32 session id | ||
82 | |||
76 | 3. Health checks | 83 | 3. Health checks |
77 | 84 | ||
78 | The client may request a health check/PID report from a server: | 85 | The client may request a health check/PID report from a server: |
@@ -149,10 +156,21 @@ The client then sends its standard input and output file descriptors | |||
149 | 156 | ||
150 | The contents of "reserved" are currently ignored. | 157 | The contents of "reserved" are currently ignored. |
151 | 158 | ||
152 | A server may reply with a MUX_S_SESSION_OPEED, a MUX_S_PERMISSION_DENIED | 159 | A server may reply with a MUX_S_SESSION_OPENED, a MUX_S_PERMISSION_DENIED |
153 | or a MUX_S_FAILURE. | 160 | or a MUX_S_FAILURE. |
154 | 161 | ||
155 | 8. Status messages | 162 | 8. Requesting shutdown of mux listener |
163 | |||
164 | A client may request the master to stop accepting new multiplexing requests | ||
165 | and remove its listener socket. | ||
166 | |||
167 | uint32 MUX_C_STOP_LISTENING | ||
168 | uint32 request id | ||
169 | |||
170 | A server may reply with a MUX_S_OK, a MUX_S_PERMISSION_DENIED or a | ||
171 | MUX_S_FAILURE. | ||
172 | |||
173 | 9. Status messages | ||
156 | 174 | ||
157 | The MUX_S_OK message is empty: | 175 | The MUX_S_OK message is empty: |
158 | 176 | ||
@@ -169,7 +187,7 @@ The MUX_S_PERMISSION_DENIED and MUX_S_FAILURE include a reason: | |||
169 | uint32 client request id | 187 | uint32 client request id |
170 | string reason | 188 | string reason |
171 | 189 | ||
172 | 9. Protocol numbers | 190 | 10. Protocol numbers |
173 | 191 | ||
174 | #define MUX_MSG_HELLO 0x00000001 | 192 | #define MUX_MSG_HELLO 0x00000001 |
175 | #define MUX_C_NEW_SESSION 0x10000002 | 193 | #define MUX_C_NEW_SESSION 0x10000002 |
@@ -178,6 +196,7 @@ The MUX_S_PERMISSION_DENIED and MUX_S_FAILURE include a reason: | |||
178 | #define MUX_C_OPEN_FWD 0x10000006 | 196 | #define MUX_C_OPEN_FWD 0x10000006 |
179 | #define MUX_C_CLOSE_FWD 0x10000007 | 197 | #define MUX_C_CLOSE_FWD 0x10000007 |
180 | #define MUX_C_NEW_STDIO_FWD 0x10000008 | 198 | #define MUX_C_NEW_STDIO_FWD 0x10000008 |
199 | #define MUX_C_STOP_LISTENING 0x10000009 | ||
181 | #define MUX_S_OK 0x80000001 | 200 | #define MUX_S_OK 0x80000001 |
182 | #define MUX_S_PERMISSION_DENIED 0x80000002 | 201 | #define MUX_S_PERMISSION_DENIED 0x80000002 |
183 | #define MUX_S_FAILURE 0x80000003 | 202 | #define MUX_S_FAILURE 0x80000003 |
@@ -185,6 +204,7 @@ The MUX_S_PERMISSION_DENIED and MUX_S_FAILURE include a reason: | |||
185 | #define MUX_S_ALIVE 0x80000005 | 204 | #define MUX_S_ALIVE 0x80000005 |
186 | #define MUX_S_SESSION_OPENED 0x80000006 | 205 | #define MUX_S_SESSION_OPENED 0x80000006 |
187 | #define MUX_S_REMOTE_PORT 0x80000007 | 206 | #define MUX_S_REMOTE_PORT 0x80000007 |
207 | #define MUX_S_TTY_ALLOC_FAIL 0x80000008 | ||
188 | 208 | ||
189 | #define MUX_FWD_LOCAL 1 | 209 | #define MUX_FWD_LOCAL 1 |
190 | #define MUX_FWD_REMOTE 2 | 210 | #define MUX_FWD_REMOTE 2 |
@@ -192,12 +212,10 @@ The MUX_S_PERMISSION_DENIED and MUX_S_FAILURE include a reason: | |||
192 | 212 | ||
193 | XXX TODO | 213 | XXX TODO |
194 | XXX extended status (e.g. report open channels / forwards) | 214 | XXX extended status (e.g. report open channels / forwards) |
195 | XXX graceful close (delete listening socket, but keep existing sessions active) | ||
196 | XXX lock (maybe) | 215 | XXX lock (maybe) |
197 | XXX watch in/out traffic (pre/post crypto) | 216 | XXX watch in/out traffic (pre/post crypto) |
198 | XXX inject packet (what about replies) | 217 | XXX inject packet (what about replies) |
199 | XXX server->client error/warning notifications | 218 | XXX server->client error/warning notifications |
200 | XXX port0 rfwd (need custom response message) | ||
201 | XXX send signals via mux | 219 | XXX send signals via mux |
202 | 220 | ||
203 | $OpenBSD: PROTOCOL.mux,v 1.4 2011/01/31 21:42:15 djm Exp $ | 221 | $OpenBSD: PROTOCOL.mux,v 1.7 2011/05/08 12:52:01 djm Exp $ |