mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

qrap: Drop debugging left-overs, enable timeout for connect() too

Browse source 
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2021-09-01 16:38:11 +02:00
parent b15e97cb9d
commit 04d62bb013
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qrap.c
View file

@ -113,7 +113,7 @@ void usage(const char *name)
*/ */
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct timeval tv = { .tv_sec = 0, .tv_usec = 100 * 1000 }; struct timeval tv = { .tv_sec = 0, .tv_usec = 500 * 1000 };
int i, s, qemu_argc = 0, addr_map = 0, has_dev = 0; int i, s, qemu_argc = 0, addr_map = 0, has_dev = 0;
char *qemu_argv[ARG_MAX], dev_str[ARG_MAX]; char *qemu_argv[ARG_MAX], dev_str[ARG_MAX];
struct sockaddr_un addr = { struct sockaddr_un addr = {
@ -232,12 +232,11 @@ int main(int argc, char **argv)
qemu_argv[qemu_argc++] = "socket,fd=" STR(DEFAULT_FD) ",id=hostnet0"; qemu_argv[qemu_argc++] = "socket,fd=" STR(DEFAULT_FD) ",id=hostnet0";
qemu_argv[qemu_argc] = NULL; qemu_argv[qemu_argc] = NULL;
system("ls /tmp > /tmp/ls_tmp.txt");
valid_args: valid_args:
for (i = 1; i < UNIX_SOCK_MAX; i++) { for (i = 1; i < UNIX_SOCK_MAX; i++) {
s = socket(AF_UNIX, SOCK_STREAM, 0); s = socket(AF_UNIX, SOCK_STREAM, 0);
setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
if (s < 0) { if (s < 0) {
perror("socket"); perror("socket");
@ -255,8 +254,6 @@ valid_args:
break; break;
fprintf(stderr, "Probe of %s failed\n", addr.sun_path); fprintf(stderr, "Probe of %s failed\n", addr.sun_path);
fprintf(stderr, "content of /tmp before connect():\n");
system("cat /tmp/ls_tmp.txt");
close(s); close(s);
} }
@ -268,6 +265,7 @@ valid_args:
tv.tv_usec = 0; tv.tv_usec = 0;
setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
fprintf(stderr, "Connected to %s\n", addr.sun_path); fprintf(stderr, "Connected to %s\n", addr.sun_path);
if (dup2(s, (int)fd) < 0) { if (dup2(s, (int)fd) < 0) {