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

qrexec: fix waiting for qrexec-agent data connection

Browse Source 
In case of vchan server libvchan_is_open() returns VCHAN_WAITING (2) when
client is not yet connected.
This commit is contained in:
Marek Marczykowski-Górecki 2015-04-16 15:47:54 +02:00
parent 6cf84a7319
commit d6f0cfcbad
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qrexec/qrexec-client.c
View File

@ -598,10 +598,10 @@ int main(int argc, char **argv)
else { else {
data_vchan = libvchan_server_init(data_domain, data_port, data_vchan = libvchan_server_init(data_domain, data_port,
VCHAN_BUFFER_SIZE, VCHAN_BUFFER_SIZE); VCHAN_BUFFER_SIZE, VCHAN_BUFFER_SIZE);
while (data_vchan && !libvchan_is_open(data_vchan)) while (data_vchan && libvchan_is_open(data_vchan) == VCHAN_WAITING)
libvchan_wait(data_vchan); libvchan_wait(data_vchan);
} }
if (!data_vchan) { if (!data_vchan || !libvchan_is_open(data_vchan)) {
fprintf(stderr, "Failed to open data vchan connection\n"); fprintf(stderr, "Failed to open data vchan connection\n");
do_exit(1); do_exit(1);
} }
@ -635,8 +635,12 @@ int main(int argc, char **argv)
fprintf(stderr, "Failed to start data vchan server\n"); fprintf(stderr, "Failed to start data vchan server\n");
do_exit(1); do_exit(1);
} }
while (!libvchan_is_open(data_vchan)) while (libvchan_is_open(data_vchan) == VCHAN_WAITING)
libvchan_wait(data_vchan); libvchan_wait(data_vchan);
if (!libvchan_is_open(data_vchan)) {
fprintf(stderr, "Failed to open data vchan connection\n");
do_exit(1);
}
if (handle_agent_handshake(data_vchan, 0) < 0) if (handle_agent_handshake(data_vchan, 0) < 0)
do_exit(1); do_exit(1);
select_loop(data_vchan); select_loop(data_vchan);