From d5041cc814934595c7ec3f30e9f0168b191dcea2 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Thu, 8 Apr 2021 22:47:17 +0200 Subject: iface-modem-3gpp: ignore 'profile-id' and 'apn-type' matching initial EPS settings We should not try to match the 'profile-id', as that setting is not available in the input bearer settings provided by the user. And we should not try to match the 'apn-type', as not all implementations support it and it's not really necessary for this purpose anyway. --- src/mm-iface-modem-3gpp.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c index 93899355..61e492a4 100644 --- a/src/mm-iface-modem-3gpp.c +++ b/src/mm-iface-modem-3gpp.c @@ -30,14 +30,20 @@ #define SUBSYSTEM_3GPP "3gpp" -/* When comparing EPS bearer settings take into account that PASSWORD may not always - * be readable, and apply very loose matching for all fields. Also, some implementations - * may allow configuring roaming allowance in the initial EPS bearer, but that is also - * not common. */ +/* When comparing EPS bearer settings take into account that: + * - 'password' may not always be readable. + * - 'apn-type' may not always be supported. + * - 'profile-id' will not be known in the requested settings + * - we ignore settings not applicable to profiles, like 'allow-roaming' or + * 'rm-protocol'. + * - we apply very loose matching for all fields. + */ #define MM_BEARER_PROPERTIES_CMP_FLAGS_EPS \ (MM_BEARER_PROPERTIES_CMP_FLAGS_LOOSE | \ + MM_BEARER_PROPERTIES_CMP_FLAGS_NO_PROFILE_ID | \ MM_BEARER_PROPERTIES_CMP_FLAGS_NO_PASSWORD | \ MM_BEARER_PROPERTIES_CMP_FLAGS_NO_ALLOW_ROAMING | \ + MM_BEARER_PROPERTIES_CMP_FLAGS_NO_APN_TYPE | \ MM_BEARER_PROPERTIES_CMP_FLAGS_NO_RM_PROTOCOL) /*****************************************************************************/ -- cgit v1.2.3-70-g09d2