summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--PROTOCOL.mux26
2 files changed, 17 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index a91768a57..5ea138ed7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
3 - djm@cvs.openbsd.org 2011/01/13 21:54:53 3 - djm@cvs.openbsd.org 2011/01/13 21:54:53
4 [mux.c] 4 [mux.c]
5 correct error messages; patch from bert.wesarg AT googlemail.com 5 correct error messages; patch from bert.wesarg AT googlemail.com
6 - djm@cvs.openbsd.org 2011/01/13 21:55:25
7 [PROTOCOL.mux]
8 correct protocol names and add a couple of missing protocol number
9 defines; patch from bert.wesarg AT googlemail.com
6 10
720110213 1120110213
8 - (djm) [misc.c] include time.h for nanosleep() prototype 12 - (djm) [misc.c] include time.h for nanosleep() prototype
diff --git a/PROTOCOL.mux b/PROTOCOL.mux
index 1d8c463a7..3d6f81878 100644
--- a/PROTOCOL.mux
+++ b/PROTOCOL.mux
@@ -28,7 +28,7 @@ defined.
28To open a new multiplexed session, a client may send the following 28To open a new multiplexed session, a client may send the following
29request: 29request:
30 30
31 uint32 MUX_C_MSG_NEW_SESSION 31 uint32 MUX_C_NEW_SESSION
32 uint32 request id 32 uint32 request id
33 string reserved 33 string reserved
34 bool want tty flag 34 bool want tty flag
@@ -99,7 +99,7 @@ The server will reply with one of MUX_S_OK or MUX_S_PERMISSION_DENIED.
99 99
100A client may request the master to establish a port forward: 100A client may request the master to establish a port forward:
101 101
102 uint32 MUX_C_OPEN_FORWARD 102 uint32 MUX_C_OPEN_FWD
103 uint32 request id 103 uint32 request id
104 uint32 forwarding type 104 uint32 forwarding type
105 string listen host 105 string listen host
@@ -118,24 +118,23 @@ For dynamically allocated listen port the server replies with
118 uint32 client request id 118 uint32 client request id
119 uint32 allocated remote listen port 119 uint32 allocated remote listen port
120 120
1215. Requesting closure of port forwards 1216. Requesting closure of port forwards
122
123Note: currently unimplemented (server will always reply with MUX_S_FAILURE).
122 124
123A client may request the master to establish a port forward: 125A client may request the master to establish a port forward:
124 126
125 uint32 MUX_C_OPEN_FORWARD 127 uint32 MUX_C_CLOSE_FWD
126 uint32 request id 128 uint32 request id
127 uint32 forwarding type
128 string listen host 129 string listen host
129 string listen port 130 string listen port
130 string connect host 131 string connect host
131 string connect port 132 string connect port
132 133
133forwarding type may be MUX_FWD_LOCAL, MUX_FWD_REMOTE, MUX_FWD_DYNAMIC.
134
135A server may reply with a MUX_S_OK, a MUX_S_PERMISSION_DENIED or a 134A server may reply with a MUX_S_OK, a MUX_S_PERMISSION_DENIED or a
136MUX_S_FAILURE. 135MUX_S_FAILURE.
137 136
1386. Requesting stdio forwarding 1377. Requesting stdio forwarding
139 138
140A client may request the master to establish a stdio forwarding: 139A client may request the master to establish a stdio forwarding:
141 140
@@ -153,7 +152,7 @@ The contents of "reserved" are currently ignored.
153A server may reply with a MUX_S_SESSION_OPEED, a MUX_S_PERMISSION_DENIED 152A server may reply with a MUX_S_SESSION_OPEED, a MUX_S_PERMISSION_DENIED
154or a MUX_S_FAILURE. 153or a MUX_S_FAILURE.
155 154
1567. Status messages 1558. Status messages
157 156
158The MUX_S_OK message is empty: 157The MUX_S_OK message is empty:
159 158
@@ -170,14 +169,15 @@ The MUX_S_PERMISSION_DENIED and MUX_S_FAILURE include a reason:
170 uint32 client request id 169 uint32 client request id
171 string reason 170 string reason
172 171
1737. Protocol numbers 1729. Protocol numbers
174 173
175#define MUX_MSG_HELLO 0x00000001 174#define MUX_MSG_HELLO 0x00000001
176#define MUX_C_NEW_SESSION 0x10000002 175#define MUX_C_NEW_SESSION 0x10000002
177#define MUX_C_ALIVE_CHECK 0x10000004 176#define MUX_C_ALIVE_CHECK 0x10000004
178#define MUX_C_TERMINATE 0x10000005 177#define MUX_C_TERMINATE 0x10000005
179#define MUX_C_OPEN_FORWARD 0x10000006 178#define MUX_C_OPEN_FWD 0x10000006
180#define MUX_C_CLOSE_FORWARD 0x10000007 179#define MUX_C_CLOSE_FWD 0x10000007
180#define MUX_C_NEW_STDIO_FWD 0x10000008
181#define MUX_S_OK 0x80000001 181#define MUX_S_OK 0x80000001
182#define MUX_S_PERMISSION_DENIED 0x80000002 182#define MUX_S_PERMISSION_DENIED 0x80000002
183#define MUX_S_FAILURE 0x80000003 183#define MUX_S_FAILURE 0x80000003
@@ -200,4 +200,4 @@ XXX server->client error/warning notifications
200XXX port0 rfwd (need custom response message) 200XXX port0 rfwd (need custom response message)
201XXX send signals via mux 201XXX send signals via mux
202 202
203$OpenBSD: PROTOCOL.mux,v 1.2 2010/05/16 12:55:51 markus Exp $ 203$OpenBSD: PROTOCOL.mux,v 1.3 2011/01/13 21:55:25 djm Exp $