diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-base-bearer.h | 11 | ||||
| -rw-r--r-- | src/mm-bearer-mbim.c | 6 | ||||
| -rw-r--r-- | src/mm-bearer-qmi.c | 12 | ||||
| -rw-r--r-- | src/mm-broadband-bearer.c | 4 |
4 files changed, 22 insertions, 11 deletions
diff --git a/src/mm-base-bearer.h b/src/mm-base-bearer.h index 729fa6a8..1c1f96ea 100644 --- a/src/mm-base-bearer.h +++ b/src/mm-base-bearer.h @@ -43,6 +43,17 @@ MMBearerIpConfig *mm_bearer_connect_result_peek_ipv6_config (MMBearerConnec /*****************************************************************************/ +/* Default timeout values to be used in the steps of a connection or + * disconnection attempt that may take long to complete. Note that the actual + * connection attempt from the user may have a different timeout, but we don't + * really fully care about that, it's a problem to consider in the user side. + * In the daemon itself, what we want and require is to be in sync with the + * state of the modem. */ +#define MM_BASE_BEARER_DEFAULT_CONNECTION_TIMEOUT 180 +#define MM_BASE_BEARER_DEFAULT_DISCONNECTION_TIMEOUT 120 + +/*****************************************************************************/ + #define MM_TYPE_BASE_BEARER (mm_base_bearer_get_type ()) #define MM_BASE_BEARER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BASE_BEARER, MMBaseBearer)) #define MM_BASE_BEARER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BASE_BEARER, MMBaseBearerClass)) diff --git a/src/mm-bearer-mbim.c b/src/mm-bearer-mbim.c index 7df655da..e53529ee 100644 --- a/src/mm-bearer-mbim.c +++ b/src/mm-bearer-mbim.c @@ -948,7 +948,7 @@ connect_context_step (GTask *task) mbim_device_command (ctx->device, message, - 60, + MM_BASE_BEARER_DEFAULT_DISCONNECTION_TIMEOUT, NULL, (GAsyncReadyCallback)ensure_disconnected_ready, task); @@ -1022,7 +1022,7 @@ connect_context_step (GTask *task) mbim_device_command (ctx->device, message, - 60, + MM_BASE_BEARER_DEFAULT_CONNECTION_TIMEOUT, NULL, (GAsyncReadyCallback)connect_set_ready, task); @@ -1318,7 +1318,7 @@ disconnect_context_step (GTask *task) mbim_device_command (ctx->device, message, - 60, + MM_BASE_BEARER_DEFAULT_DISCONNECTION_TIMEOUT, NULL, (GAsyncReadyCallback)disconnect_set_ready, task); diff --git a/src/mm-bearer-qmi.c b/src/mm-bearer-qmi.c index b3ea0d84..e29414f4 100644 --- a/src/mm-bearer-qmi.c +++ b/src/mm-bearer-qmi.c @@ -479,7 +479,7 @@ connect_context_free (ConnectContext *ctx) input = qmi_message_wds_stop_network_input_new (); qmi_message_wds_stop_network_input_set_packet_data_handle (input, ctx->packet_data_handle_ipv4, NULL); - qmi_client_wds_stop_network (ctx->client_ipv4, input, 30, NULL, NULL, NULL); + qmi_client_wds_stop_network (ctx->client_ipv4, input, MM_BASE_BEARER_DEFAULT_DISCONNECTION_TIMEOUT, NULL, NULL, NULL); } g_clear_object (&ctx->client_ipv4); } @@ -501,7 +501,7 @@ connect_context_free (ConnectContext *ctx) input = qmi_message_wds_stop_network_input_new (); qmi_message_wds_stop_network_input_set_packet_data_handle (input, ctx->packet_data_handle_ipv6, NULL); - qmi_client_wds_stop_network (ctx->client_ipv6, input, 30, NULL, NULL, NULL); + qmi_client_wds_stop_network (ctx->client_ipv6, input, MM_BASE_BEARER_DEFAULT_DISCONNECTION_TIMEOUT, NULL, NULL, NULL); } g_clear_object (&ctx->client_ipv6); } @@ -1420,7 +1420,7 @@ connect_context_step (GTask *task) input = build_start_network_input (ctx); qmi_client_wds_start_network (ctx->client_ipv4, input, - 45, + MM_BASE_BEARER_DEFAULT_CONNECTION_TIMEOUT, g_task_get_cancellable (task), (GAsyncReadyCallback)start_network_ready, task); @@ -1511,7 +1511,7 @@ connect_context_step (GTask *task) input = build_start_network_input (ctx); qmi_client_wds_start_network (ctx->client_ipv6, input, - 45, + MM_BASE_BEARER_DEFAULT_CONNECTION_TIMEOUT, g_task_get_cancellable (task), (GAsyncReadyCallback)start_network_ready, task); @@ -1980,7 +1980,7 @@ disconnect_context_step (GTask *task) ctx->running_ipv6 = FALSE; qmi_client_wds_stop_network (ctx->client_ipv4, input, - 30, + MM_BASE_BEARER_DEFAULT_DISCONNECTION_TIMEOUT, NULL, (GAsyncReadyCallback)stop_network_ready, task); @@ -2011,7 +2011,7 @@ disconnect_context_step (GTask *task) ctx->running_ipv6 = TRUE; qmi_client_wds_stop_network (ctx->client_ipv6, input, - 30, + MM_BASE_BEARER_DEFAULT_DISCONNECTION_TIMEOUT, NULL, (GAsyncReadyCallback)stop_network_ready, task); diff --git a/src/mm-broadband-bearer.c b/src/mm-broadband-bearer.c index 004ef1f0..73869a0c 100644 --- a/src/mm-broadband-bearer.c +++ b/src/mm-broadband-bearer.c @@ -269,7 +269,7 @@ cdma_connect_context_dial (GTask *task) mm_base_modem_at_command_full (ctx->modem, MM_PORT_SERIAL_AT (ctx->data), "DT#777", - 90, + MM_BASE_BEARER_DEFAULT_CONNECTION_TIMEOUT, FALSE, FALSE, NULL, @@ -586,7 +586,7 @@ dial_3gpp (MMBroadbandBearer *self, mm_base_modem_at_command_full (ctx->modem, ctx->dial_port, command, - 60, + MM_BASE_BEARER_DEFAULT_CONNECTION_TIMEOUT, FALSE, FALSE, /* raw */ NULL, /* cancellable */ |