summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2022-02-16 16:10:25 +0100
committerLubomir Rintel <lkundrak@v3.sk>2022-02-19 13:34:02 +0100
commit47ff99515f0ecbc791851f3c1a1c61fb7efc234c (patch)
tree23f49fa979e2511e664f271af6156fe9d6fc8728
parent700e4daf1270c88d04e5e02dc9533efd8e8b3214 (diff)
downloadNetworkManager-47ff99515f0ecbc791851f3c1a1c61fb7efc234c.tar.gz
ppp-manager: give PPP more time to terminate
pppd is a delicate flower. On orderly shutdown, it likes to tell the other side. This seems to take at least a second even when no real network latency is at play, on busy systems 1.5 seconds easily ends up being inadequate. A violent shutdown is generally okay apart from that it can leave garbage (port lock) behind and the other side potentially confused for a while. As it happens, this interacts badly with modemu.pl which is used for testing: the pseudo terminal in PPP line discipline mode has no idea that the remote disconnected and while ModemManager is learning that something wrong the hard way (AT command timing out, because the remote still expects to talk PPP), the test times out. Let's increase the timeout to something more reasonable. https://bugzilla.redhat.com/show_bug.cgi?id=2049596 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1103
-rw-r--r--src/core/ppp/nm-ppp-manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ppp/nm-ppp-manager.c b/src/core/ppp/nm-ppp-manager.c
index f1f1030575..dd6b1bc7f0 100644
--- a/src/core/ppp/nm-ppp-manager.c
+++ b/src/core/ppp/nm-ppp-manager.c
@@ -1246,7 +1246,7 @@ _ppp_manager_stop(NMPPPManager *self,
SIGTERM,
LOGD_PPP,
"pppd",
- NM_SHUTDOWN_TIMEOUT_MS,
+ 5000,
_stop_child_cb,
handle);