From 2c27a7aadc79f3ded2e0ab13cc757266639f01e1 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 31 Mar 2021 23:33:24 +0200 Subject: base-bearer: remove default IP family property There is no point in providing a configurable default IP family in the bearer object, because we can always assume IPv4 as being the only default expected. Simplify the logic and also provide a new method to get the normalize the IP family, using IPv4 as default always. --- src/mm-modem-helpers.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/mm-modem-helpers.c') diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index a0702200..ce97cbc2 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -4099,6 +4099,20 @@ mm_3gpp_get_ip_family_from_pdp_type (const gchar *pdp_type) return MM_BEARER_IP_FAMILY_NONE; } +gboolean +mm_3gpp_normalize_ip_family (MMBearerIpFamily *family, + gpointer log_object) +{ + /* if nothing specific requested, default to IPv4 */ + if (*family == MM_BEARER_IP_FAMILY_NONE || *family == MM_BEARER_IP_FAMILY_ANY) { + *family = MM_BEARER_IP_FAMILY_IPV4; + return TRUE; + } + + /* no need to normalize */ + return FALSE; +} + /*************************************************************************/ /* ICCID validation */ /* -- cgit v1.2.3-70-g09d2