diff options
| author | Michael Biebl <biebl@debian.org> | 2022-05-04 15:38:03 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-05-04 15:38:03 +0200 |
| commit | fc1f1b6881ed5199b4cc81face915769a3dc9897 (patch) | |
| tree | d2b3f6b775541cece8de7ef9e687c72665f5d820 /src/core/nm-firewall-utils.c | |
| parent | 16cc38ed3d1761b178512c9a6c291ad366c6fad8 (diff) | |
| parent | 9959fdb2e8ddd06f2161798ca0a39c77d67c652d (diff) | |
Update upstream source from tag 'upstream/1.37.92'
Update to upstream version '1.37.92' with Debian dir 0128b715b1fc3e516169a4599c33567587d59088
Diffstat (limited to 'src/core/nm-firewall-utils.c')
| -rw-r--r-- | src/core/nm-firewall-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/nm-firewall-utils.c b/src/core/nm-firewall-utils.c index ddac1137..8fa8059e 100644 --- a/src/core/nm-firewall-utils.c +++ b/src/core/nm-firewall-utils.c @@ -422,7 +422,7 @@ _fw_nft_call_communicate_cb(GObject *source, GAsyncResult *result, gpointer user nm_g_main_context_push_thread_default_if_necessary(NULL); nm_shutdown_wait_obj_register_object(call_data->subprocess, "nft-terminate"); - G_STATIC_ASSERT_EXPR(200 < NM_SHUTDOWN_TIMEOUT_MS_WATCHDOG * 2 / 3); + G_STATIC_ASSERT_EXPR(200 < NM_SHUTDOWN_TIMEOUT_ADDITIONAL_MSEC * 2 / 3); nm_g_subprocess_terminate_in_background(call_data->subprocess, 200); } } else if (g_subprocess_get_successful(call_data->subprocess)) { @@ -546,7 +546,7 @@ _fw_nft_call(GBytes *stdin_buf, call_data); call_data->timeout_source = - nm_g_source_attach(nm_g_timeout_source_new((NM_SHUTDOWN_TIMEOUT_MS * 2) / 3, + nm_g_source_attach(nm_g_timeout_source_new((NM_SHUTDOWN_TIMEOUT_1500_MSEC * 2) / 3, G_PRIORITY_DEFAULT, _fw_nft_call_timeout_cb, call_data, |