diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2018-11-14 18:00:38 +0100 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2018-12-07 16:20:53 +0000 |
| commit | 48ba504f4e7e59cde380954fba84a790d34eaef4 (patch) | |
| tree | b8ce05110de32c9b73ddb8f7ab0fb1c5107dcdee /src/mm-bearer-mbim.c | |
| parent | d6e2c69129900f50dd8c0ed6cb9a7a17c141a85e (diff) | |
helpers-mbim: new method to convert IP type settings to/from MM
Diffstat (limited to 'src/mm-bearer-mbim.c')
| -rw-r--r-- | src/mm-bearer-mbim.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/src/mm-bearer-mbim.c b/src/mm-bearer-mbim.c index 8bf5d770..a776c7f1 100644 --- a/src/mm-bearer-mbim.c +++ b/src/mm-bearer-mbim.c @@ -973,30 +973,10 @@ connect_context_step (GTask *task) g_free (str); } - if (ip_family == MM_BEARER_IP_FAMILY_IPV4) - ctx->ip_type = MBIM_CONTEXT_IP_TYPE_IPV4; - else if (ip_family == MM_BEARER_IP_FAMILY_IPV6) - ctx->ip_type = MBIM_CONTEXT_IP_TYPE_IPV6; - else if (ip_family == MM_BEARER_IP_FAMILY_IPV4V6) - ctx->ip_type = MBIM_CONTEXT_IP_TYPE_IPV4V6; - else if (ip_family == (MM_BEARER_IP_FAMILY_IPV4 | MM_BEARER_IP_FAMILY_IPV6)) - ctx->ip_type = MBIM_CONTEXT_IP_TYPE_IPV4_AND_IPV6; - else if (ip_family == MM_BEARER_IP_FAMILY_NONE || - ip_family == MM_BEARER_IP_FAMILY_ANY) - /* A valid default IP family should have been specified */ - g_assert_not_reached (); - else { - gchar * str; - - str = mm_bearer_ip_family_build_string_from_mask (ip_family); - g_task_return_new_error ( - task, - MM_CORE_ERROR, - MM_CORE_ERROR_UNSUPPORTED, - "Unsupported IP type configuration: '%s'", - str); + ctx->ip_type = mm_bearer_ip_family_to_mbim_context_ip_type (ip_family, &error); + if (error) { + g_task_return_error (task, error); g_object_unref (task); - g_free (str); return; } |