summaryrefslogtreecommitdiff
path: root/src/core/dnsmasq/nm-dnsmasq-manager.c
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2022-02-18 14:01:19 +0100
committerLubomir Rintel <lkundrak@v3.sk>2022-02-18 14:13:03 +0100
commitc699f086f5d166ccda0e50e91234b9f8be97280b (patch)
tree4ac6fcc6df899f0ce3f648d8f11d45d8b5842404 /src/core/dnsmasq/nm-dnsmasq-manager.c
parentfd8932ef6922c006b42206e0d83eafb1bdb52eb2 (diff)
utils: remove timeout argument from nm_utils_term_child_async()lr/simplify-child-kill
This simplifies things a little -- 5 seconds should be enough for everybody. It also increases the timeout it all cases. This is done so that the timeout is also good enough for pppd, which is generally the slowest thing to shut down. On orderly shutdown, pp 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 pppd 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. Fixes-test: @gsm_sim_mtu https://bugzilla.redhat.com/show_bug.cgi?id=2049596
Diffstat (limited to 'src/core/dnsmasq/nm-dnsmasq-manager.c')
-rw-r--r--src/core/dnsmasq/nm-dnsmasq-manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/dnsmasq/nm-dnsmasq-manager.c b/src/core/dnsmasq/nm-dnsmasq-manager.c
index 88f8fc7261..9026b0400c 100644
--- a/src/core/dnsmasq/nm-dnsmasq-manager.c
+++ b/src/core/dnsmasq/nm-dnsmasq-manager.c
@@ -299,7 +299,7 @@ nm_dnsmasq_manager_stop(NMDnsMasqManager *manager)
nm_clear_g_source(&priv->dm_watch_id);
if (priv->pid) {
- nm_utils_term_child_async(priv->pid, LOGD_SHARING, "dnsmasq", 2000, NULL, NULL);
+ nm_utils_term_child_async(priv->pid, LOGD_SHARING, "dnsmasq", NULL, NULL);
priv->pid = 0;
}