api,bearer: new 'profile-id' setting

We define a new 'profile-id' setting in the bearer properties that
users will use to specify which connection profile of the ones
available in the device should be connected.

When the 'profile-id' is given, the associated bearer object will be
bound to the 'profile-id', and the user is able to provide additional
settings to apply on top (e.g. if the profile storage doesn't allow
some of the settings we support, like 'apn-type', or if the setting is
completely unrelated to profiles, like 'multiplex').

After introducing the 'profile-id' as a valid setting in the bearer
properties, we also reimplement the properties object internals to
make use a 3GPP profile for the subset of common settings between both
objects.

1 files changed, 11 insertions, 3 deletions

diff --git a/cli/mmcli-bearer.c b/cli/mmcli-bearer.c
index 913b6780..8dbcece5 100644
--- a/cli/mmcli-bearer.c
+++ b/cli/mmcli-bearer.c
@@ -162,12 +162,19 @@ print_bearer_info (MMBearer *bearer)
         const gchar *password = NULL;
         const gchar *rm_protocol = NULL;
         gchar       *allowed_auth_str = NULL;
+        gchar       *properties_profile_id_str = NULL;
 
         if (properties) {
+            gint properties_profile_id;
+
+            properties_profile_id = mm_bearer_properties_get_profile_id (properties);
+            if (properties_profile_id != MM_3GPP_PROFILE_ID_UNKNOWN)
+                properties_profile_id_str = g_strdup_printf ("%d", properties_profile_id);
+
             apn              = mm_bearer_properties_get_apn (properties);
-            apn_type_str     = (properties ? mm_bearer_apn_type_build_string_from_mask (mm_bearer_properties_get_apn_type (properties)) : NULL);
-            ip_family_str    = (properties ? mm_bearer_ip_family_build_string_from_mask (mm_bearer_properties_get_ip_type (properties)) : NULL);
-            allowed_auth_str = (properties ? mm_bearer_allowed_auth_build_string_from_mask (mm_bearer_properties_get_allowed_auth (properties)) : NULL);
+            apn_type_str     = mm_bearer_apn_type_build_string_from_mask (mm_bearer_properties_get_apn_type (properties));
+            ip_family_str    = mm_bearer_ip_family_build_string_from_mask (mm_bearer_properties_get_ip_type (properties));
+            allowed_auth_str = mm_bearer_allowed_auth_build_string_from_mask (mm_bearer_properties_get_allowed_auth (properties));
             user             = mm_bearer_properties_get_user (properties);
             password         = mm_bearer_properties_get_password (properties);
             if (mm_bearer_get_bearer_type (bearer) != MM_BEARER_TYPE_DEFAULT_ATTACH) {
@@ -176,6 +183,7 @@ print_bearer_info (MMBearer *bearer)
             }
         }
 
+        mmcli_output_string_take      (MMC_F_BEARER_PROPERTIES_PROFILE_ID,   properties_profile_id_str);
         mmcli_output_string           (MMC_F_BEARER_PROPERTIES_APN,          apn);
         mmcli_output_string_take      (MMC_F_BEARER_PROPERTIES_APN_TYPE,     apn_type_str);
         mmcli_output_string           (MMC_F_BEARER_PROPERTIES_ROAMING,      roaming);