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

qrexec: impose startup time limit for qrexec_daemon

Browse Source
This commit is contained in:
Rafal Wojtczuk 2011-07-22 13:47:34 +02:00 committed by Marek Marczykowski
parent 1668567f2c
commit abd8b79864
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qrexec/qrexec_daemon.c
View File

@ -82,12 +82,14 @@ int create_qrexec_socket(int domid, char *domname)
return get_server_socket(socket_address); return get_server_socket(socket_address);
} }
#define MAX_STARTUP_TIME 120
/* do the preparatory tasks, needed before entering the main event loop */ /* do the preparatory tasks, needed before entering the main event loop */
void init(int xid) void init(int xid)
{ {
char qrexec_error_log_name[256]; char qrexec_error_log_name[256];
int logfd; int logfd;
int i;
if (xid <= 0) { if (xid <= 0) {
fprintf(stderr, "domain id=0?\n"); fprintf(stderr, "domain id=0?\n");
@ -102,11 +104,12 @@ void init(int xid)
break; break;
default: default:
fprintf(stderr, "Waiting for VM's qrexec agent."); fprintf(stderr, "Waiting for VM's qrexec agent.");
for (;;) { for (i=0;i<MAX_STARTUP_TIME;i++) {
sleep(1); sleep(1);
fprintf(stderr, "."); fprintf(stderr, ".");
} }
exit(0); fprintf(stderr, "Cannot connect to qrexec agent for %d seconds, giving up\n", MAX_STARTUP_TIME);
exit(1);
} }
close(0); close(0);
snprintf(qrexec_error_log_name, sizeof(qrexec_error_log_name), snprintf(qrexec_error_log_name, sizeof(qrexec_error_log_name),