diff options
| author |   Menglong Dong <imagedong@tencent.com> | 2023-01-06 10:57:24 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2023-01-09 07:30:50 +0000 |
| commit | 4a753ca5013d465694d6639fbe1378831a399bda (patch) | |
| tree | 1ea39f7277b593930ab65855fce31094e86d75eb /tools/testing/selftests/net/mptcp/mptcp_connect.c | |
| parent | mptcp: add statistics for mptcp socket in use (diff) | |
| download | wireguard-linux-4a753ca5013d465694d6639fbe1378831a399bda.tar.xz wireguard-linux-4a753ca5013d465694d6639fbe1378831a399bda.zip | |
selftest: mptcp: exit from copyfd_io_poll() when receive SIGUSR1
For now, mptcp_connect won't exit after receiving the 'SIGUSR1' signal
if '-r' is set. Fix this by skipping poll and sleep in copyfd_io_poll()
if 'quit' is set.
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Menglong Dong <imagedong@tencent.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/net/mptcp/mptcp_connect.c')
| -rw-r--r-- | tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c index 8a8266957bc5..b25a31445ded 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -627,7 +627,7 @@ static int copyfd_io_poll(int infd, int peerfd, int outfd, char rbuf[8192]; ssize_t len; - if (fds.events == 0) + if (fds.events == 0 || quit) break; switch (poll(&fds, 1, poll_timeout)) { @@ -733,7 +733,7 @@ static int copyfd_io_poll(int infd, int peerfd, int outfd, } /* leave some time for late join/announce */ - if (cfg_remove) + if (cfg_remove && !quit) usleep(cfg_wait); return 0; |