diff options
| author | Dan Williams <dan@ioncontrol.co> | 2025-03-06 15:11:00 +0000 |
|---|---|---|
| committer | Dan Williams <dan@ioncontrol.co> | 2025-03-06 15:11:00 +0000 |
| commit | 9ab4b7de58d007ff405a071bca47977f9654e88f (patch) | |
| tree | 90b840d4df82a73274af8eb85fc7b04328341a3a | |
| parent | c393a917c1095ec07b6da1d9e8460501059544c0 (diff) | |
| parent | f014f3843e51a66d3ab3d80d9b63d7c73fb55e10 (diff) | |
Merge request !1307 from 'scan-cli-timeouts'
broadband-modem,cli: slightly bump 3GPP scan timeout; add some cli dbus timeout slack
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/1307
| -rw-r--r-- | cli/mmcli-modem-3gpp.c | 10 | ||||
| -rw-r--r-- | cli/mmcli-modem-simple.c | 6 | ||||
| -rw-r--r-- | src/mm-broadband-modem.c | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/cli/mmcli-modem-3gpp.c b/cli/mmcli-modem-3gpp.c index dc344567..010f4c8b 100644 --- a/cli/mmcli-modem-3gpp.c +++ b/cli/mmcli-modem-3gpp.c @@ -551,8 +551,9 @@ get_modem_ready (GObject *source, if (scan_flag) { g_debug ("Asynchronously scanning for networks..."); - /* Setup operation timeout: 5 minutes (to match MM internal timeout) */ - g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (ctx->modem_3gpp), 5 * 60 * 1000); + /* Setup operation timeout: 5 minutes 17 seconds (to match MM internal + * timeout with a bit of slack) */ + g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (ctx->modem_3gpp), ((5 * 60) + 17) * 1000); mm_modem_3gpp_scan (ctx->modem_3gpp, ctx->cancellable, (GAsyncReadyCallback)scan_ready, @@ -564,8 +565,9 @@ get_modem_ready (GObject *source, if (register_in_operator_str || register_home_flag) { g_debug ("Asynchronously registering the modem..."); - /* Setup operation timeout: 2 minutes (to match MM internal timeout) */ - g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (ctx->modem_3gpp), 2 * 60 * 1000); + /* Setup operation timeout: 2 minutes 2 seconds (to match MM internal + * timeout with a bit of slack) */ + g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (ctx->modem_3gpp), ((2 * 60) + 2) * 1000); mm_modem_3gpp_register (ctx->modem_3gpp, (register_in_operator_str ? register_in_operator_str : ""), ctx->cancellable, diff --git a/cli/mmcli-modem-simple.c b/cli/mmcli-modem-simple.c index b09cd0fa..4efa77cd 100644 --- a/cli/mmcli-modem-simple.c +++ b/cli/mmcli-modem-simple.c @@ -210,9 +210,9 @@ get_modem_ready (GObject *source, g_debug ("Asynchronously connecting the modem..."); - /* Setup operation timeout: 2 minutes (to match MM internal timeout) */ - g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (ctx->modem_simple), 2 * 60 * 1000); - + /* Setup operation timeout: 2 minutes 2 seconds (to match MM internal + * timeout with a bit of slack) */ + g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (ctx->modem_simple), ((2 * 60) + 2) * 1000); properties = mm_simple_connect_properties_new_from_string (connect_str, &error); if (!properties) { g_printerr ("Error parsing connect string: '%s'\n", error->message); diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index cd031e4c..ee216525 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -5317,7 +5317,7 @@ modem_3gpp_scan_networks (MMIfaceModem3gpp *self, { mm_base_modem_at_command (MM_BASE_MODEM (self), "+COPS=?", - 300, + 315, FALSE, callback, user_data); |