Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qrexec: in agent, handle CONNECT_EXISTING the way convenient for client

Browse Source
This commit is contained in:
Rafal Wojtczuk 2011-07-05 12:46:33 +02:00
parent 703cedc708
commit 9ac98a77b9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qrexec/qrexec_agent.c
View File

@ -191,13 +191,12 @@ void handle_exec(int client_id, int len)
} }
void handle_connect_existing(int client_id) void handle_connect_existing(int client_id, int len)
{ {
int stdin_fd, stdout_fd, stderr_fd; int stdin_fd, stdout_fd, stderr_fd;
struct connect_existing_params params; char buf[len];
read_all_vchan_ext(&params, sizeof(params)); read_all_vchan_ext(buf, len);
sscanf(params.ident, "%d %d %d", &stdin_fd, &stdout_fd, sscanf(buf, "%d %d %d", &stdin_fd, &stdout_fd, &stderr_fd);
&stderr_fd);
create_info_about_client(client_id, 0, stdin_fd, stdout_fd, create_info_about_client(client_id, 0, stdin_fd, stdout_fd,
stderr_fd); stderr_fd);
client_info[client_id].is_exited = 1; //do not wait for SIGCHLD client_info[client_id].is_exited = 1; //do not wait for SIGCHLD
@ -328,7 +327,7 @@ void handle_server_data()
set_blocked_outerr(s_hdr.client_id, 1); set_blocked_outerr(s_hdr.client_id, 1);
break; break;
case MSG_SERVER_TO_AGENT_CONNECT_EXISTING: case MSG_SERVER_TO_AGENT_CONNECT_EXISTING:
handle_connect_existing(s_hdr.client_id); handle_connect_existing(s_hdr.client_id, s_hdr.len);
break; break;
case MSG_SERVER_TO_AGENT_EXEC_CMDLINE: case MSG_SERVER_TO_AGENT_EXEC_CMDLINE:
handle_exec(s_hdr.client_id, s_hdr.len); handle_exec(s_hdr.client_id, s_hdr.len);