From 21b2819f1566fc6af97a708548eae433270b3230 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 16 Feb 2022 16:10:25 +0100 Subject: [PATCH] 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 --- src/core/ppp/nm-ppp-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);