QubesOS/qubes-linux-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qrexec: update protocol

Browse Source 
- add new messages
- uniform packet header
- organize #defines
This commit is contained in:
Marek Marczykowski-Górecki 2013-12-27 05:52:04 +01:00
parent 0ca9e06877
commit 591fb10a32
1 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
qrexec-lib/qrexec.h
View File

@ -23,18 +23,13 @@
#include <stdint.h> #include <stdint.h>
#define QREXEC_DAEMON_SOCKET_DIR "/var/run/qubes" #define QREXEC_PROTOCOL_VERSION 2
#define MAX_FDS 256 #define MAX_FDS 256
#define MAX_DATA_CHUNK 4096 #define MAX_DATA_CHUNK 4096
#define REXEC_PORT 512 #define RPC_REQUEST_COMMAND "QUBESRPC"
#define VCHAN_BASE_PORT 512
#define QREXEC_AGENT_TRIGGER_PATH "/var/run/qubes/qrexec-agent" #define MAX_DATA_CHUNK 4096
#define QREXEC_AGENT_FDPASS_PATH "/var/run/qubes/qrexec-agent-fdpass"
#define MEMINFO_WRITER_PIDFILE "/var/run/meminfo-writer.pid"
#define QUBES_RPC_MULTIPLEXER_PATH "/usr/lib/qubes/qubes-rpc-multiplexer"
#define QUBES_RPC_MAGIC_CMD "QUBESRPC"
/* Messages sent over control vchan between daemon(dom0) and agent(vm). /* Messages sent over control vchan between daemon(dom0) and agent(vm).
* The same are used between client(dom0) and daemon(dom0). * The same are used between client(dom0) and daemon(dom0).
@ -63,20 +58,29 @@ enum {
/* call Qubes RPC service /* call Qubes RPC service
* struct trigger_service_params passed as data */ * struct trigger_service_params passed as data */
MSG_TRIGGER_SERVICE = 0x210, MSG_TRIGGER_SERVICE = 0x210,
/* connection was terminated, struct exec_params passed as data (with empty
* cmdline field) informs about released vchan port */
MSG_CONNECTION_TERMINATED,
/* common messages */
/* initialize connection, struct peer_info passed as data
* should be sent as the first message (server first, then client) */
MSG_HELLO = 0x300,
}; };
/* daemon<->agent and daemon->client */ /* uniform for all peers, data type depends on message type */
struct server_header { struct msg_header {
uint32_t type; uint32_t type; /* message type */
uint32_t connect_domain; uint32_t len; /* data length */
uint32_t connect_port;
uint32_t len;
}; };
/* client->daemon */ /* variable size */
struct client_header { struct exec_params {
uint32_t type; uint32_t connect_domain; /* target domain name */
uint32_t len; uint32_t connect_port; /* target vchan port for i/o exchange */
char cmdline[0]; /* command line to execute, size = msg_header.len - sizeof(struct exec_params) */
}; };
struct service_params { struct service_params {
@ -86,7 +90,11 @@ struct service_params {
struct trigger_service_params { struct trigger_service_params {
char service_name[64]; char service_name[64];
char target_domain[32]; char target_domain[32];
struct service_params process_fds; struct service_params request_id; /* service request id */
};
struct peer_info {
uint32_t version; /* qrexec protocol version */
}; };
/* data vchan client<->agent, separate for each VM process */ /* data vchan client<->agent, separate for each VM process */
@ -101,8 +109,11 @@ enum {
MSG_DATA_EXIT_CODE, MSG_DATA_EXIT_CODE,
}; };
struct data_header { // linux-specific stuff below
uint32_t type;
uint32_t len; #define QREXEC_AGENT_TRIGGER_PATH "/var/run/qubes/qrexec-agent"
}; #define QREXEC_AGENT_FDPASS_PATH "/var/run/qubes/qrexec-agent-fdpass"
#define MEMINFO_WRITER_PIDFILE "/var/run/meminfo-writer.pid"
#define QUBES_RPC_MULTIPLEXER_PATH "/usr/lib/qubes/qubes-rpc-multiplexer"
#define QREXEC_DAEMON_SOCKET_DIR "/var/run/qubes"