api,modem-3gpp: new 'InitialEpsBearerSettings' property

This property shows the settings stored in the device to be used
during the initial LTE attach procedure.

9 files changed, 408 insertions, 158 deletions

diff --git a/cli/mmcli-modem.c b/cli/mmcli-modem.c
index a98434b1..86de4ef0 100644
--- a/cli/mmcli-modem.c
+++ b/cli/mmcli-modem.c
@@ -368,8 +368,29 @@ print_modem_info (void)
         mmcli_output_pco_list    (pco_list);
 
         if (mm_modem_get_current_capabilities (ctx->modem) & (MM_MODEM_CAPABILITY_LTE | MM_MODEM_CAPABILITY_LTE_ADVANCED)) {
+            MMBearerProperties *properties = NULL;
+            const gchar        *apn = NULL;
+            gchar              *ip_family_str = NULL;
+            const gchar        *user = NULL;
+            const gchar        *password = NULL;
+
             mmcli_output_string (MMC_F_3GPP_EPS_UE_MODE,             eps_ue_mode);
             mmcli_output_string (MMC_F_3GPP_EPS_INITIAL_BEARER_PATH, g_strcmp0 (initial_eps_bearer_path, "/") != 0 ? initial_eps_bearer_path : NULL);
+
+            if (ctx->modem_3gpp) {
+                properties = mm_modem_3gpp_peek_initial_eps_bearer_settings (ctx->modem_3gpp);
+                if (properties) {
+                    apn           = mm_bearer_properties_get_apn (properties);
+                    ip_family_str = (properties ? mm_bearer_ip_family_build_string_from_mask (mm_bearer_properties_get_ip_type (properties)) : NULL);
+                    user          = mm_bearer_properties_get_user (properties);
+                    password      = mm_bearer_properties_get_password (properties);
+                }
+            }
+
+            mmcli_output_string      (MMC_F_3GPP_EPS_BEARER_SETTINGS_APN,      apn);
+            mmcli_output_string_take (MMC_F_3GPP_EPS_BEARER_SETTINGS_IP_TYPE,  ip_family_str);
+            mmcli_output_string      (MMC_F_3GPP_EPS_BEARER_SETTINGS_USER,     user);
+            mmcli_output_string      (MMC_F_3GPP_EPS_BEARER_SETTINGS_PASSWORD, password);
         }
 
         g_free (facility_locks);
diff --git a/cli/mmcli-output.c b/cli/mmcli-output.c
index 4bfdf17a..de6c1fcb 100644
--- a/cli/mmcli-output.c
+++ b/cli/mmcli-output.c
@@ -91,162 +91,166 @@ typedef struct {
 } FieldInfo;
 
 static FieldInfo field_infos[] = {
-    [MMC_F_GENERAL_DBUS_PATH]               = { "modem.dbus-path",                         "dbus path",                MMC_S_MODEM_GENERAL,         },
-    [MMC_F_GENERAL_DEVICE_ID]               = { "modem.generic.device-identifier",         "device id",                MMC_S_MODEM_GENERAL,         },
-    [MMC_F_HARDWARE_MANUFACTURER]           = { "modem.generic.manufacturer",              "manufacturer",             MMC_S_MODEM_HARDWARE,        },
-    [MMC_F_HARDWARE_MODEL]                  = { "modem.generic.model",                     "model",                    MMC_S_MODEM_HARDWARE,        },
-    [MMC_F_HARDWARE_REVISION]               = { "modem.generic.revision",                  "revision",                 MMC_S_MODEM_HARDWARE,        },
-    [MMC_F_HARDWARE_HW_REVISION]            = { "modem.generic.hardware-revision",         "h/w revision",             MMC_S_MODEM_HARDWARE,        },
-    [MMC_F_HARDWARE_SUPPORTED_CAPABILITIES] = { "modem.generic.supported-capabilities",    "supported",                MMC_S_MODEM_HARDWARE,        },
-    [MMC_F_HARDWARE_CURRENT_CAPABILITIES]   = { "modem.generic.current-capabilities",      "current",                  MMC_S_MODEM_HARDWARE,        },
-    [MMC_F_HARDWARE_EQUIPMENT_ID]           = { "modem.generic.equipment-identifier",      "equipment id",             MMC_S_MODEM_HARDWARE,        },
-    [MMC_F_SYSTEM_DEVICE]                   = { "modem.generic.device",                    "device",                   MMC_S_MODEM_SYSTEM,          },
-    [MMC_F_SYSTEM_DRIVERS]                  = { "modem.generic.drivers",                   "drivers",                  MMC_S_MODEM_SYSTEM,          },
-    [MMC_F_SYSTEM_PLUGIN]                   = { "modem.generic.plugin",                    "plugin",                   MMC_S_MODEM_SYSTEM,          },
-    [MMC_F_SYSTEM_PRIMARY_PORT]             = { "modem.generic.primary-port",              "primary port",             MMC_S_MODEM_SYSTEM,          },
-    [MMC_F_SYSTEM_PORTS]                    = { "modem.generic.ports",                     "ports",                    MMC_S_MODEM_SYSTEM,          },
-    [MMC_F_NUMBERS_OWN]                     = { "modem.generic.own-numbers",               "own",                      MMC_S_MODEM_NUMBERS,         },
-    [MMC_F_STATUS_LOCK]                     = { "modem.generic.unlock-required",           "lock",                     MMC_S_MODEM_STATUS,          },
-    [MMC_F_STATUS_UNLOCK_RETRIES]           = { "modem.generic.unlock-retries",            "unlock retries",           MMC_S_MODEM_STATUS,          },
-    [MMC_F_STATUS_STATE]                    = { "modem.generic.state",                     "state",                    MMC_S_MODEM_STATUS,          },
-    [MMC_F_STATUS_FAILED_REASON]            = { "modem.generic.state-failed-reason",       "failed reason",            MMC_S_MODEM_STATUS,          },
-    [MMC_F_STATUS_POWER_STATE]              = { "modem.generic.power-state",               "power state",              MMC_S_MODEM_STATUS,          },
-    [MMC_F_STATUS_ACCESS_TECH]              = { "modem.generic.access-technologies",       "access tech",              MMC_S_MODEM_STATUS,          },
-    [MMC_F_STATUS_SIGNAL_QUALITY_VALUE]     = { "modem.generic.signal-quality.value",      "signal quality",           MMC_S_MODEM_STATUS,          },
-    [MMC_F_STATUS_SIGNAL_QUALITY_RECENT]    = { "modem.generic.signal-quality.recent",     NULL,                       MMC_S_UNKNOWN,               },
-    [MMC_F_MODES_SUPPORTED]                 = { "modem.generic.supported-modes",           "supported",                MMC_S_MODEM_MODES,           },
-    [MMC_F_MODES_CURRENT]                   = { "modem.generic.current-modes",             "current",                  MMC_S_MODEM_MODES,           },
-    [MMC_F_BANDS_SUPPORTED]                 = { "modem.generic.supported-bands",           "supported",                MMC_S_MODEM_BANDS,           },
-    [MMC_F_BANDS_CURRENT]                   = { "modem.generic.current-bands",             "current",                  MMC_S_MODEM_BANDS,           },
-    [MMC_F_IP_SUPPORTED]                    = { "modem.generic.supported-ip-families",     "supported",                MMC_S_MODEM_IP,              },
-    [MMC_F_3GPP_IMEI]                       = { "modem.3gpp.imei",                         "imei",                     MMC_S_MODEM_3GPP,            },
-    [MMC_F_3GPP_ENABLED_LOCKS]              = { "modem.3gpp.enabled-locks",                "enabled locks",            MMC_S_MODEM_3GPP,            },
-    [MMC_F_3GPP_OPERATOR_ID]                = { "modem.3gpp.operator-code",                "operator id",              MMC_S_MODEM_3GPP,            },
-    [MMC_F_3GPP_OPERATOR_NAME]              = { "modem.3gpp.operator-name",                "operator name",            MMC_S_MODEM_3GPP,            },
-    [MMC_F_3GPP_REGISTRATION]               = { "modem.3gpp.registration-state",           "registration",             MMC_S_MODEM_3GPP,            },
-    [MMC_F_3GPP_PCO]                        = { "modem.3gpp.pco",                          "pco",                      MMC_S_MODEM_3GPP,            },
-    [MMC_F_3GPP_EPS_UE_MODE]                = { "modem.3gpp.eps.ue-mode-operation",        "ue mode of operation",     MMC_S_MODEM_3GPP_EPS,        },
-    [MMC_F_3GPP_EPS_INITIAL_BEARER_PATH]    = { "modem.3gpp.eps.initial-bearer.dbus-path", "initial bearer dbus path", MMC_S_MODEM_3GPP_EPS,        },
-    [MMC_F_3GPP_SCAN_NETWORKS]              = { "modem.3gpp.scan-networks",                "networks",                 MMC_S_MODEM_3GPP_SCAN,       },
-    [MMC_F_3GPP_USSD_STATUS]                = { "modem.3gpp.ussd.status",                  "status",                   MMC_S_MODEM_3GPP_USSD,       },
-    [MMC_F_3GPP_USSD_NETWORK_REQUEST]       = { "modem.3gpp.ussd.network-request",         "network request",          MMC_S_MODEM_3GPP_USSD,       },
-    [MMC_F_3GPP_USSD_NETWORK_NOTIFICATION]  = { "modem.3gpp.ussd.network-notification",    "network notification",     MMC_S_MODEM_3GPP_USSD,       },
-    [MMC_F_CDMA_MEID]                       = { "modem.cdma.meid",                         "meid",                     MMC_S_MODEM_CDMA,            },
-    [MMC_F_CDMA_ESN]                        = { "modem.cdma.esn",                          "esn",                      MMC_S_MODEM_CDMA,            },
-    [MMC_F_CDMA_SID]                        = { "modem.cdma.sid",                          "sid",                      MMC_S_MODEM_CDMA,            },
-    [MMC_F_CDMA_NID]                        = { "modem.cdma.nid",                          "nid",                      MMC_S_MODEM_CDMA,            },
-    [MMC_F_CDMA_REGISTRATION_CDMA1X]        = { "modem.cdma.cdma1x-registration-state",    "registration cdma1x",      MMC_S_MODEM_CDMA,            },
-    [MMC_F_CDMA_REGISTRATION_EVDO]          = { "modem.cdma.evdo-registration-state",      "registration evdo",        MMC_S_MODEM_CDMA,            },
-    [MMC_F_CDMA_ACTIVATION]                 = { "modem.cdma.activation-state",             "activation",               MMC_S_MODEM_CDMA,            },
-    [MMC_F_SIM_PATH]                        = { "modem.generic.sim",                       "dbus path",                MMC_S_MODEM_SIM,             },
-    [MMC_F_BEARER_PATHS]                    = { "modem.generic.bearers",                   "dbus path",                MMC_S_MODEM_BEARER,          },
-    [MMC_F_TIME_CURRENT]                    = { "modem.time.current",                      "current",                  MMC_S_MODEM_TIME,            },
-    [MMC_F_TIMEZONE_CURRENT]                = { "modem.timezone.current",                  "current",                  MMC_S_MODEM_TIMEZONE,        },
-    [MMC_F_TIMEZONE_DST_OFFSET]             = { "modem.time.dst-offset",                   "dst offset",               MMC_S_MODEM_TIMEZONE,        },
-    [MMC_F_TIMEZONE_LEAP_SECONDS]           = { "modem.time.leap-seconds",                 "leap seconds",             MMC_S_MODEM_TIMEZONE,        },
-    [MMC_F_MESSAGING_SUPPORTED_STORAGES]    = { "modem.messaging.supported-storages",      "supported storages",       MMC_S_MODEM_MESSAGING,       },
-    [MMC_F_MESSAGING_DEFAULT_STORAGES]      = { "modem.messaging.default-storages",        "default storages",         MMC_S_MODEM_MESSAGING,       },
-    [MMC_F_SIGNAL_REFRESH_RATE]             = { "modem.signal.refresh.rate",               "refresh rate",             MMC_S_MODEM_SIGNAL,          },
-    [MMC_F_SIGNAL_CDMA1X_RSSI]              = { "modem.signal.cdma1x.rssi",                "rssi",                     MMC_S_MODEM_SIGNAL_CDMA1X,   },
-    [MMC_F_SIGNAL_CDMA1X_ECIO]              = { "modem.signal.cdma1x.ecio",                "ecio",                     MMC_S_MODEM_SIGNAL_CDMA1X,   },
-    [MMC_F_SIGNAL_EVDO_RSSI]                = { "modem.signal.evdo.rssi",                  "rssi",                     MMC_S_MODEM_SIGNAL_EVDO,     },
-    [MMC_F_SIGNAL_EVDO_ECIO]                = { "modem.signal.evdo.ecio",                  "ecio",                     MMC_S_MODEM_SIGNAL_EVDO,     },
-    [MMC_F_SIGNAL_EVDO_SINR]                = { "modem.signal.evdo.sinr",                  "sinr",                     MMC_S_MODEM_SIGNAL_EVDO,     },
-    [MMC_F_SIGNAL_EVDO_IO]                  = { "modem.signal.evdo.io",                    "io",                       MMC_S_MODEM_SIGNAL_EVDO,     },
-    [MMC_F_SIGNAL_GSM_RSSI]                 = { "modem.signal.gsm.rssi",                   "rssi",                     MMC_S_MODEM_SIGNAL_GSM,      },
-    [MMC_F_SIGNAL_UMTS_RSSI]                = { "modem.signal.umts.rssi",                  "rssi",                     MMC_S_MODEM_SIGNAL_UMTS,     },
-    [MMC_F_SIGNAL_UMTS_RSCP]                = { "modem.signal.umts.rscp",                  "rscp",                     MMC_S_MODEM_SIGNAL_UMTS,     },
-    [MMC_F_SIGNAL_UMTS_ECIO]                = { "modem.signal.umts.ecio",                  "ecio",                     MMC_S_MODEM_SIGNAL_UMTS,     },
-    [MMC_F_SIGNAL_LTE_RSSI]                 = { "modem.signal.lte.rssi",                   "rssi",                     MMC_S_MODEM_SIGNAL_LTE,      },
-    [MMC_F_SIGNAL_LTE_RSRQ]                 = { "modem.signal.lte.rsrq",                   "rsrq",                     MMC_S_MODEM_SIGNAL_LTE,      },
-    [MMC_F_SIGNAL_LTE_RSRP]                 = { "modem.signal.lte.rsrp",                   "rsrp",                     MMC_S_MODEM_SIGNAL_LTE,      },
-    [MMC_F_SIGNAL_LTE_SNR]                  = { "modem.signal.lte.snr",                    "s/n",                      MMC_S_MODEM_SIGNAL_LTE,      },
-    [MMC_F_OMA_FEATURES]                    = { "modem.oma.features",                      "features",                 MMC_S_MODEM_OMA,             },
-    [MMC_F_OMA_CURRENT_TYPE]                = { "modem.oma.current.type",                  "type",                     MMC_S_MODEM_OMA_CURRENT,     },
-    [MMC_F_OMA_CURRENT_STATE]               = { "modem.oma.current.state",                 "state",                    MMC_S_MODEM_OMA_CURRENT,     },
-    [MMC_F_OMA_PENDING_SESSIONS]            = { "modem.oma.pending-sessions",              "sessions",                 MMC_S_MODEM_OMA_PENDING,     },
-    [MMC_F_LOCATION_CAPABILITIES]           = { "modem.location.capabilities",             "capabilities",             MMC_S_MODEM_LOCATION,        },
-    [MMC_F_LOCATION_ENABLED]                = { "modem.location.enabled",                  "enabled",                  MMC_S_MODEM_LOCATION,        },
-    [MMC_F_LOCATION_SIGNALS]                = { "modem.location.signals",                  "signals",                  MMC_S_MODEM_LOCATION,        },
-    [MMC_F_LOCATION_GPS_REFRESH_RATE]       = { "modem.location.gps.refresh-rate",         "refresh rate",             MMC_S_MODEM_LOCATION_GPS,    },
-    [MMC_F_LOCATION_GPS_SUPL_SERVER]        = { "modem.location.gps.supl-server",          "a-gps supl server",        MMC_S_MODEM_LOCATION_GPS,    },
-    [MMC_F_LOCATION_GPS_ASSISTANCE]         = { "modem.location.gps.assistance",           "supported assistance",     MMC_S_MODEM_LOCATION_GPS,    },
-    [MMC_F_LOCATION_GPS_ASSISTANCE_SERVERS] = { "modem.location.gps.assistance-servers",   "assistance servers",       MMC_S_MODEM_LOCATION_GPS,    },
-    [MMC_F_LOCATION_3GPP_MCC]               = { "modem.location.3gpp.mcc",                 "operator code",            MMC_S_MODEM_LOCATION_3GPP,   },
-    [MMC_F_LOCATION_3GPP_MNC]               = { "modem.location.3gpp.mnc",                 "operator name",            MMC_S_MODEM_LOCATION_3GPP,   },
-    [MMC_F_LOCATION_3GPP_LAC]               = { "modem.location.3gpp.lac",                 "location area code",       MMC_S_MODEM_LOCATION_3GPP,   },
-    [MMC_F_LOCATION_3GPP_TAC]               = { "modem.location.3gpp.tac",                 "tracking area code",       MMC_S_MODEM_LOCATION_3GPP,   },
-    [MMC_F_LOCATION_3GPP_CID]               = { "modem.location.3gpp.cid",                 "cell id",                  MMC_S_MODEM_LOCATION_3GPP,   },
-    [MMC_F_LOCATION_GPS_NMEA]               = { "modem.location.gps.nmea",                 "nmea",                     MMC_S_MODEM_LOCATION_GPS,    },
-    [MMC_F_LOCATION_GPS_UTC]                = { "modem.location.gps.utc",                  "utc",                      MMC_S_MODEM_LOCATION_GPS,    },
-    [MMC_F_LOCATION_GPS_LONG]               = { "modem.location.gps.longitude",            "longitude",                MMC_S_MODEM_LOCATION_GPS,    },
-    [MMC_F_LOCATION_GPS_LAT]                = { "modem.location.gps.latitude",             "latitude",                 MMC_S_MODEM_LOCATION_GPS,    },
-    [MMC_F_LOCATION_GPS_ALT]                = { "modem.location.gps.altitude",             "altitude",                 MMC_S_MODEM_LOCATION_GPS,    },
-    [MMC_F_LOCATION_CDMABS_LONG]            = { "modem.location.cdma-bs.longitude",        "longitude",                MMC_S_MODEM_LOCATION_CDMABS, },
-    [MMC_F_LOCATION_CDMABS_LAT]             = { "modem.location.cdma-bs.latitude",         "latitude",                 MMC_S_MODEM_LOCATION_CDMABS, },
-    [MMC_F_FIRMWARE_LIST]                   = { "modem.firmware-list",                     "list",                     MMC_S_MODEM_FIRMWARE,        },
-    [MMC_F_BEARER_GENERAL_DBUS_PATH]        = { "bearer.dbus-path",                        "dbus path",                MMC_S_BEARER_GENERAL,        },
-    [MMC_F_BEARER_GENERAL_TYPE]             = { "bearer.type",                             "type",                     MMC_S_BEARER_GENERAL,        },
-    [MMC_F_BEARER_STATUS_CONNECTED]         = { "bearer.status.connected",                 "connected",                MMC_S_BEARER_STATUS,         },
-    [MMC_F_BEARER_STATUS_SUSPENDED]         = { "bearer.status.suspended",                 "suspended",                MMC_S_BEARER_STATUS,         },
-    [MMC_F_BEARER_STATUS_INTERFACE]         = { "bearer.status.interface",                 "interface",                MMC_S_BEARER_STATUS,         },
-    [MMC_F_BEARER_STATUS_IP_TIMEOUT]        = { "bearer.status.ip-timeout",                "ip timeout",               MMC_S_BEARER_STATUS,         },
-    [MMC_F_BEARER_PROPERTIES_APN]           = { "bearer.properties.apn",                   "apn",                      MMC_S_BEARER_PROPERTIES,     },
-    [MMC_F_BEARER_PROPERTIES_ROAMING]       = { "bearer.properties.roaming",               "roaming",                  MMC_S_BEARER_PROPERTIES,     },
-    [MMC_F_BEARER_PROPERTIES_IP_TYPE]       = { "bearer.properties.ip-type",               "ip type",                  MMC_S_BEARER_PROPERTIES,     },
-    [MMC_F_BEARER_PROPERTIES_USER]          = { "bearer.properties.user",                  "user",                     MMC_S_BEARER_PROPERTIES,     },
-    [MMC_F_BEARER_PROPERTIES_PASSWORD]      = { "bearer.properties.password",              "password",                 MMC_S_BEARER_PROPERTIES,     },
-    [MMC_F_BEARER_PROPERTIES_NUMBER]        = { "bearer.properties.number",                "number",                   MMC_S_BEARER_PROPERTIES,     },
-    [MMC_F_BEARER_PROPERTIES_RM_PROTOCOL]   = { "bearer.properties.rm-protocol",           "rm protocol",              MMC_S_BEARER_PROPERTIES,     },
-    [MMC_F_BEARER_IPV4_CONFIG_METHOD]       = { "bearer.ipv4-config.method",               "method",                   MMC_S_BEARER_IPV4_CONFIG,    },
-    [MMC_F_BEARER_IPV4_CONFIG_ADDRESS]      = { "bearer.ipv4-config.address",              "address",                  MMC_S_BEARER_IPV4_CONFIG,    },
-    [MMC_F_BEARER_IPV4_CONFIG_PREFIX]       = { "bearer.ipv4-config.prefix",               "prefix",                   MMC_S_BEARER_IPV4_CONFIG,    },
-    [MMC_F_BEARER_IPV4_CONFIG_GATEWAY]      = { "bearer.ipv4-config.gateway",              "gateway",                  MMC_S_BEARER_IPV4_CONFIG,    },
-    [MMC_F_BEARER_IPV4_CONFIG_DNS]          = { "bearer.ipv4-config.dns",                  "dns",                      MMC_S_BEARER_IPV4_CONFIG,    },
-    [MMC_F_BEARER_IPV4_CONFIG_MTU]          = { "bearer.ipv4-config.mtu",                  "mtu",                      MMC_S_BEARER_IPV4_CONFIG,    },
-    [MMC_F_BEARER_IPV6_CONFIG_METHOD]       = { "bearer.ipv6-config.method",               "method",                   MMC_S_BEARER_IPV6_CONFIG,    },
-    [MMC_F_BEARER_IPV6_CONFIG_ADDRESS]      = { "bearer.ipv6-config.address",              "address",                  MMC_S_BEARER_IPV6_CONFIG,    },
-    [MMC_F_BEARER_IPV6_CONFIG_PREFIX]       = { "bearer.ipv6-config.prefix",               "prefix",                   MMC_S_BEARER_IPV6_CONFIG,    },
-    [MMC_F_BEARER_IPV6_CONFIG_GATEWAY]      = { "bearer.ipv6-config.gateway",              "gateway",                  MMC_S_BEARER_IPV6_CONFIG,    },
-    [MMC_F_BEARER_IPV6_CONFIG_DNS]          = { "bearer.ipv6-config.dns",                  "dns",                      MMC_S_BEARER_IPV6_CONFIG,    },
-    [MMC_F_BEARER_IPV6_CONFIG_MTU]          = { "bearer.ipv6-config.mtu",                  "mtu",                      MMC_S_BEARER_IPV6_CONFIG,    },
-    [MMC_F_BEARER_STATS_DURATION]           = { "bearer.stats.duration",                   "duration",                 MMC_S_BEARER_STATS,          },
-    [MMC_F_BEARER_STATS_BYTES_RX]           = { "bearer.stats.bytes-rx",                   "bytes rx",                 MMC_S_BEARER_STATS,          },
-    [MMC_F_BEARER_STATS_BYTES_TX]           = { "bearer.stats.bytes-tx",                   "bytes tx",                 MMC_S_BEARER_STATS,          },
-    [MMC_F_CALL_GENERAL_DBUS_PATH]          = { "call.dbus-path",                          "dbus path",                MMC_S_CALL_GENERAL,          },
-    [MMC_F_CALL_PROPERTIES_NUMBER]          = { "call.properties.number",                  "number",                   MMC_S_CALL_PROPERTIES,       },
-    [MMC_F_CALL_PROPERTIES_DIRECTION]       = { "call.properties.direction",               "direction",                MMC_S_CALL_PROPERTIES,       },
-    [MMC_F_CALL_PROPERTIES_STATE]           = { "call.properties.state",                   "state",                    MMC_S_CALL_PROPERTIES,       },
-    [MMC_F_CALL_PROPERTIES_STATE_REASON]    = { "call.properties.state-reason",            "state reason",             MMC_S_CALL_PROPERTIES,       },
-    [MMC_F_CALL_PROPERTIES_AUDIO_PORT]      = { "call.properties.audio-port",              "audio port",               MMC_S_CALL_PROPERTIES,       },
-    [MMC_F_CALL_AUDIO_FORMAT_ENCODING]      = { "call.audio-format.encoding",              "encoding",                 MMC_S_CALL_AUDIO_FORMAT,     },
-    [MMC_F_CALL_AUDIO_FORMAT_RESOLUTION]    = { "call.audio-format.resolution",            "resolution",               MMC_S_CALL_AUDIO_FORMAT,     },
-    [MMC_F_CALL_AUDIO_FORMAT_RATE]          = { "call.audio-format.rate",                  "rate",                     MMC_S_CALL_AUDIO_FORMAT,     },
-    [MMC_F_SMS_GENERAL_DBUS_PATH]           = { "sms.dbus-path",                           "dbus path",                MMC_S_SMS_GENERAL,           },
-    [MMC_F_SMS_CONTENT_NUMBER]              = { "sms.content.number",                      "number",                   MMC_S_SMS_CONTENT,           },
-    [MMC_F_SMS_CONTENT_TEXT]                = { "sms.content.text",                        "text",                     MMC_S_SMS_CONTENT,           },
-    [MMC_F_SMS_CONTENT_DATA]                = { "sms.content.data",                        "data",                     MMC_S_SMS_CONTENT,           },
-    [MMC_F_SMS_PROPERTIES_PDU_TYPE]         = { "sms.properties.pdu-type",                 "pdu type",                 MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_STATE]            = { "sms.properties.state",                    "state",                    MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_VALIDITY]         = { "sms.properties.validity",                 "validity",                 MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_STORAGE]          = { "sms.properties.storage",                  "storage",                  MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_SMSC]             = { "sms.properties.smsc",                     "smsc",                     MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_CLASS]            = { "sms.properties.class",                    "class",                    MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_TELESERVICE_ID]   = { "sms.properties.teleservice-id",           "teleservice id",           MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_SERVICE_CATEGORY] = { "sms.properties.service-category",         "service category",         MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_DELIVERY_REPORT]  = { "sms.properties.delivery-report",          "delivery report",          MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_MSG_REFERENCE]    = { "sms.properties.message-reference",        "message reference",        MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_TIMESTAMP]        = { "sms.properties.timestamp",                "timestamp",                MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_DELIVERY_STATE]   = { "sms.properties.delivery-state",           "delivery state",           MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SMS_PROPERTIES_DISCH_TIMESTAMP]  = { "sms.properties.discharge-timestamp",      "discharge timestamp",      MMC_S_SMS_PROPERTIES,        },
-    [MMC_F_SIM_GENERAL_DBUS_PATH]           = { "sim.dbus-path",                           "dbus path",                MMC_S_SIM_GENERAL,           },
-    [MMC_F_SIM_PROPERTIES_IMSI]             = { "sim.properties.imsi",                     "imsi",                     MMC_S_SIM_PROPERTIES,        },
-    [MMC_F_SIM_PROPERTIES_ICCID]            = { "sim.properties.iccid",                    "iccid",                    MMC_S_SIM_PROPERTIES,        },
-    [MMC_F_SIM_PROPERTIES_OPERATOR_ID]      = { "sim.properties.operator-code",            "operator id",              MMC_S_SIM_PROPERTIES,        },
-    [MMC_F_SIM_PROPERTIES_OPERATOR_NAME]    = { "sim.properties.operator-name",            "operator name",            MMC_S_SIM_PROPERTIES,        },
-    [MMC_F_MODEM_LIST_DBUS_PATH]            = { "modem-list",                              "modems",                   MMC_S_UNKNOWN,               },
-    [MMC_F_SMS_LIST_DBUS_PATH]              = { "modem.messaging.sms",                     "sms messages",             MMC_S_UNKNOWN,               },
-    [MMC_F_CALL_LIST_DBUS_PATH]             = { "modem.voice.call",                        "calls",                    MMC_S_UNKNOWN,               },
+    [MMC_F_GENERAL_DBUS_PATH]                 = { "modem.dbus-path",                                 "dbus path",                MMC_S_MODEM_GENERAL,         },
+    [MMC_F_GENERAL_DEVICE_ID]                 = { "modem.generic.device-identifier",                 "device id",                MMC_S_MODEM_GENERAL,         },
+    [MMC_F_HARDWARE_MANUFACTURER]             = { "modem.generic.manufacturer",                      "manufacturer",             MMC_S_MODEM_HARDWARE,        },
+    [MMC_F_HARDWARE_MODEL]                    = { "modem.generic.model",                             "model",                    MMC_S_MODEM_HARDWARE,        },
+    [MMC_F_HARDWARE_REVISION]                 = { "modem.generic.revision",                          "revision",                 MMC_S_MODEM_HARDWARE,        },
+    [MMC_F_HARDWARE_HW_REVISION]              = { "modem.generic.hardware-revision",                 "h/w revision",             MMC_S_MODEM_HARDWARE,        },
+    [MMC_F_HARDWARE_SUPPORTED_CAPABILITIES]   = { "modem.generic.supported-capabilities",            "supported",                MMC_S_MODEM_HARDWARE,        },
+    [MMC_F_HARDWARE_CURRENT_CAPABILITIES]     = { "modem.generic.current-capabilities",              "current",                  MMC_S_MODEM_HARDWARE,        },
+    [MMC_F_HARDWARE_EQUIPMENT_ID]             = { "modem.generic.equipment-identifier",              "equipment id",             MMC_S_MODEM_HARDWARE,        },
+    [MMC_F_SYSTEM_DEVICE]                     = { "modem.generic.device",                            "device",                   MMC_S_MODEM_SYSTEM,          },
+    [MMC_F_SYSTEM_DRIVERS]                    = { "modem.generic.drivers",                           "drivers",                  MMC_S_MODEM_SYSTEM,          },
+    [MMC_F_SYSTEM_PLUGIN]                     = { "modem.generic.plugin",                            "plugin",                   MMC_S_MODEM_SYSTEM,          },
+    [MMC_F_SYSTEM_PRIMARY_PORT]               = { "modem.generic.primary-port",                      "primary port",             MMC_S_MODEM_SYSTEM,          },
+    [MMC_F_SYSTEM_PORTS]                      = { "modem.generic.ports",                             "ports",                    MMC_S_MODEM_SYSTEM,          },
+    [MMC_F_NUMBERS_OWN]                       = { "modem.generic.own-numbers",                       "own",                      MMC_S_MODEM_NUMBERS,         },
+    [MMC_F_STATUS_LOCK]                       = { "modem.generic.unlock-required",                   "lock",                     MMC_S_MODEM_STATUS,          },
+    [MMC_F_STATUS_UNLOCK_RETRIES]             = { "modem.generic.unlock-retries",                    "unlock retries",           MMC_S_MODEM_STATUS,          },
+    [MMC_F_STATUS_STATE]                      = { "modem.generic.state",                             "state",                    MMC_S_MODEM_STATUS,          },
+    [MMC_F_STATUS_FAILED_REASON]              = { "modem.generic.state-failed-reason",               "failed reason",            MMC_S_MODEM_STATUS,          },
+    [MMC_F_STATUS_POWER_STATE]                = { "modem.generic.power-state",                       "power state",              MMC_S_MODEM_STATUS,          },
+    [MMC_F_STATUS_ACCESS_TECH]                = { "modem.generic.access-technologies",               "access tech",              MMC_S_MODEM_STATUS,          },
+    [MMC_F_STATUS_SIGNAL_QUALITY_VALUE]       = { "modem.generic.signal-quality.value",              "signal quality",           MMC_S_MODEM_STATUS,          },
+    [MMC_F_STATUS_SIGNAL_QUALITY_RECENT]      = { "modem.generic.signal-quality.recent",             NULL,                       MMC_S_UNKNOWN,               },
+    [MMC_F_MODES_SUPPORTED]                   = { "modem.generic.supported-modes",                   "supported",                MMC_S_MODEM_MODES,           },
+    [MMC_F_MODES_CURRENT]                     = { "modem.generic.current-modes",                     "current",                  MMC_S_MODEM_MODES,           },
+    [MMC_F_BANDS_SUPPORTED]                   = { "modem.generic.supported-bands",                   "supported",                MMC_S_MODEM_BANDS,           },
+    [MMC_F_BANDS_CURRENT]                     = { "modem.generic.current-bands",                     "current",                  MMC_S_MODEM_BANDS,           },
+    [MMC_F_IP_SUPPORTED]                      = { "modem.generic.supported-ip-families",             "supported",                MMC_S_MODEM_IP,              },
+    [MMC_F_3GPP_IMEI]                         = { "modem.3gpp.imei",                                 "imei",                     MMC_S_MODEM_3GPP,            },
+    [MMC_F_3GPP_ENABLED_LOCKS]                = { "modem.3gpp.enabled-locks",                        "enabled locks",            MMC_S_MODEM_3GPP,            },
+    [MMC_F_3GPP_OPERATOR_ID]                  = { "modem.3gpp.operator-code",                        "operator id",              MMC_S_MODEM_3GPP,            },
+    [MMC_F_3GPP_OPERATOR_NAME]                = { "modem.3gpp.operator-name",                        "operator name",            MMC_S_MODEM_3GPP,            },
+    [MMC_F_3GPP_REGISTRATION]                 = { "modem.3gpp.registration-state",                   "registration",             MMC_S_MODEM_3GPP,            },
+    [MMC_F_3GPP_PCO]                          = { "modem.3gpp.pco",                                  "pco",                      MMC_S_MODEM_3GPP,            },
+    [MMC_F_3GPP_EPS_UE_MODE]                  = { "modem.3gpp.eps.ue-mode-operation",                "ue mode of operation",     MMC_S_MODEM_3GPP_EPS,        },
+    [MMC_F_3GPP_EPS_INITIAL_BEARER_PATH]      = { "modem.3gpp.eps.initial-bearer.dbus-path",         "initial bearer dbus path", MMC_S_MODEM_3GPP_EPS,        },
+    [MMC_F_3GPP_EPS_BEARER_SETTINGS_APN]      = { "modem.3gpp.eps.initial-bearer.settings.apn",      "initial bearer apn",       MMC_S_MODEM_3GPP_EPS,        },
+    [MMC_F_3GPP_EPS_BEARER_SETTINGS_IP_TYPE]  = { "modem.3gpp.eps.initial-bearer.settings.ip-type",  "initial bearer ip type",   MMC_S_MODEM_3GPP_EPS,        },
+    [MMC_F_3GPP_EPS_BEARER_SETTINGS_USER]     = { "modem.3gpp.eps.initial-bearer.settings.user",     "initial bearer user",      MMC_S_MODEM_3GPP_EPS,        },
+    [MMC_F_3GPP_EPS_BEARER_SETTINGS_PASSWORD] = { "modem.3gpp.eps.initial-bearer.settings.password", "initial bearer password",  MMC_S_MODEM_3GPP_EPS,        },
+    [MMC_F_3GPP_SCAN_NETWORKS]                = { "modem.3gpp.scan-networks",                        "networks",                 MMC_S_MODEM_3GPP_SCAN,       },
+    [MMC_F_3GPP_USSD_STATUS]                  = { "modem.3gpp.ussd.status",                          "status",                   MMC_S_MODEM_3GPP_USSD,       },
+    [MMC_F_3GPP_USSD_NETWORK_REQUEST]         = { "modem.3gpp.ussd.network-request",                 "network request",          MMC_S_MODEM_3GPP_USSD,       },
+    [MMC_F_3GPP_USSD_NETWORK_NOTIFICATION]    = { "modem.3gpp.ussd.network-notification",            "network notification",     MMC_S_MODEM_3GPP_USSD,       },
+    [MMC_F_CDMA_MEID]                         = { "modem.cdma.meid",                                 "meid",                     MMC_S_MODEM_CDMA,            },
+    [MMC_F_CDMA_ESN]                          = { "modem.cdma.esn",                                  "esn",                      MMC_S_MODEM_CDMA,            },
+    [MMC_F_CDMA_SID]                          = { "modem.cdma.sid",                                  "sid",                      MMC_S_MODEM_CDMA,            },
+    [MMC_F_CDMA_NID]                          = { "modem.cdma.nid",                                  "nid",                      MMC_S_MODEM_CDMA,            },
+    [MMC_F_CDMA_REGISTRATION_CDMA1X]          = { "modem.cdma.cdma1x-registration-state",            "registration cdma1x",      MMC_S_MODEM_CDMA,            },
+    [MMC_F_CDMA_REGISTRATION_EVDO]            = { "modem.cdma.evdo-registration-state",              "registration evdo",        MMC_S_MODEM_CDMA,            },
+    [MMC_F_CDMA_ACTIVATION]                   = { "modem.cdma.activation-state",                     "activation",               MMC_S_MODEM_CDMA,            },
+    [MMC_F_SIM_PATH]                          = { "modem.generic.sim",                               "dbus path",                MMC_S_MODEM_SIM,             },
+    [MMC_F_BEARER_PATHS]                      = { "modem.generic.bearers",                           "dbus path",                MMC_S_MODEM_BEARER,          },
+    [MMC_F_TIME_CURRENT]                      = { "modem.time.current",                              "current",                  MMC_S_MODEM_TIME,            },
+    [MMC_F_TIMEZONE_CURRENT]                  = { "modem.timezone.current",                          "current",                  MMC_S_MODEM_TIMEZONE,        },
+    [MMC_F_TIMEZONE_DST_OFFSET]               = { "modem.time.dst-offset",                           "dst offset",               MMC_S_MODEM_TIMEZONE,        },
+    [MMC_F_TIMEZONE_LEAP_SECONDS]             = { "modem.time.leap-seconds",                         "leap seconds",             MMC_S_MODEM_TIMEZONE,        },
+    [MMC_F_MESSAGING_SUPPORTED_STORAGES]      = { "modem.messaging.supported-storages",              "supported storages",       MMC_S_MODEM_MESSAGING,       },
+    [MMC_F_MESSAGING_DEFAULT_STORAGES]        = { "modem.messaging.default-storages",                "default storages",         MMC_S_MODEM_MESSAGING,       },
+    [MMC_F_SIGNAL_REFRESH_RATE]               = { "modem.signal.refresh.rate",                       "refresh rate",             MMC_S_MODEM_SIGNAL,          },
+    [MMC_F_SIGNAL_CDMA1X_RSSI]                = { "modem.signal.cdma1x.rssi",                        "rssi",                     MMC_S_MODEM_SIGNAL_CDMA1X,   },
+    [MMC_F_SIGNAL_CDMA1X_ECIO]                = { "modem.signal.cdma1x.ecio",                        "ecio",                     MMC_S_MODEM_SIGNAL_CDMA1X,   },
+    [MMC_F_SIGNAL_EVDO_RSSI]                  = { "modem.signal.evdo.rssi",                          "rssi",                     MMC_S_MODEM_SIGNAL_EVDO,     },
+    [MMC_F_SIGNAL_EVDO_ECIO]                  = { "modem.signal.evdo.ecio",                          "ecio",                     MMC_S_MODEM_SIGNAL_EVDO,     },
+    [MMC_F_SIGNAL_EVDO_SINR]                  = { "modem.signal.evdo.sinr",                          "sinr",                     MMC_S_MODEM_SIGNAL_EVDO,     },
+    [MMC_F_SIGNAL_EVDO_IO]                    = { "modem.signal.evdo.io",                            "io",                       MMC_S_MODEM_SIGNAL_EVDO,     },
+    [MMC_F_SIGNAL_GSM_RSSI]                   = { "modem.signal.gsm.rssi",                           "rssi",                     MMC_S_MODEM_SIGNAL_GSM,      },
+    [MMC_F_SIGNAL_UMTS_RSSI]                  = { "modem.signal.umts.rssi",                          "rssi",                     MMC_S_MODEM_SIGNAL_UMTS,     },
+    [MMC_F_SIGNAL_UMTS_RSCP]                  = { "modem.signal.umts.rscp",                          "rscp",                     MMC_S_MODEM_SIGNAL_UMTS,     },
+    [MMC_F_SIGNAL_UMTS_ECIO]                  = { "modem.signal.umts.ecio",                          "ecio",                     MMC_S_MODEM_SIGNAL_UMTS,     },
+    [MMC_F_SIGNAL_LTE_RSSI]                   = { "modem.signal.lte.rssi",                           "rssi",                     MMC_S_MODEM_SIGNAL_LTE,      },
+    [MMC_F_SIGNAL_LTE_RSRQ]                   = { "modem.signal.lte.rsrq",                           "rsrq",                     MMC_S_MODEM_SIGNAL_LTE,      },
+    [MMC_F_SIGNAL_LTE_RSRP]                   = { "modem.signal.lte.rsrp",                           "rsrp",                     MMC_S_MODEM_SIGNAL_LTE,      },
+    [MMC_F_SIGNAL_LTE_SNR]                    = { "modem.signal.lte.snr",                            "s/n",                      MMC_S_MODEM_SIGNAL_LTE,      },
+    [MMC_F_OMA_FEATURES]                      = { "modem.oma.features",                              "features",                 MMC_S_MODEM_OMA,             },
+    [MMC_F_OMA_CURRENT_TYPE]                  = { "modem.oma.current.type",                          "type",                     MMC_S_MODEM_OMA_CURRENT,     },
+    [MMC_F_OMA_CURRENT_STATE]                 = { "modem.oma.current.state",                         "state",                    MMC_S_MODEM_OMA_CURRENT,     },
+    [MMC_F_OMA_PENDING_SESSIONS]              = { "modem.oma.pending-sessions",                      "sessions",                 MMC_S_MODEM_OMA_PENDING,     },
+    [MMC_F_LOCATION_CAPABILITIES]             = { "modem.location.capabilities",                     "capabilities",             MMC_S_MODEM_LOCATION,        },
+    [MMC_F_LOCATION_ENABLED]                  = { "modem.location.enabled",                          "enabled",                  MMC_S_MODEM_LOCATION,        },
+    [MMC_F_LOCATION_SIGNALS]                  = { "modem.location.signals",                          "signals",                  MMC_S_MODEM_LOCATION,        },
+    [MMC_F_LOCATION_GPS_REFRESH_RATE]         = { "modem.location.gps.refresh-rate",                 "refresh rate",             MMC_S_MODEM_LOCATION_GPS,    },
+    [MMC_F_LOCATION_GPS_SUPL_SERVER]          = { "modem.location.gps.supl-server",                  "a-gps supl server",        MMC_S_MODEM_LOCATION_GPS,    },
+    [MMC_F_LOCATION_GPS_ASSISTANCE]           = { "modem.location.gps.assistance",                   "supported assistance",     MMC_S_MODEM_LOCATION_GPS,    },
+    [MMC_F_LOCATION_GPS_ASSISTANCE_SERVERS]   = { "modem.location.gps.assistance-servers",           "assistance servers",       MMC_S_MODEM_LOCATION_GPS,    },
+    [MMC_F_LOCATION_3GPP_MCC]                 = { "modem.location.3gpp.mcc",                         "operator code",            MMC_S_MODEM_LOCATION_3GPP,   },
+    [MMC_F_LOCATION_3GPP_MNC]                 = { "modem.location.3gpp.mnc",                         "operator name",            MMC_S_MODEM_LOCATION_3GPP,   },
+    [MMC_F_LOCATION_3GPP_LAC]                 = { "modem.location.3gpp.lac",                         "location area code",       MMC_S_MODEM_LOCATION_3GPP,   },
+    [MMC_F_LOCATION_3GPP_TAC]                 = { "modem.location.3gpp.tac",                         "tracking area code",       MMC_S_MODEM_LOCATION_3GPP,   },
+    [MMC_F_LOCATION_3GPP_CID]                 = { "modem.location.3gpp.cid",                         "cell id",                  MMC_S_MODEM_LOCATION_3GPP,   },
+    [MMC_F_LOCATION_GPS_NMEA]                 = { "modem.location.gps.nmea",                         "nmea",                     MMC_S_MODEM_LOCATION_GPS,    },
+    [MMC_F_LOCATION_GPS_UTC]                  = { "modem.location.gps.utc",                          "utc",                      MMC_S_MODEM_LOCATION_GPS,    },
+    [MMC_F_LOCATION_GPS_LONG]                 = { "modem.location.gps.longitude",                    "longitude",                MMC_S_MODEM_LOCATION_GPS,    },
+    [MMC_F_LOCATION_GPS_LAT]                  = { "modem.location.gps.latitude",                     "latitude",                 MMC_S_MODEM_LOCATION_GPS,    },
+    [MMC_F_LOCATION_GPS_ALT]                  = { "modem.location.gps.altitude",                     "altitude",                 MMC_S_MODEM_LOCATION_GPS,    },
+    [MMC_F_LOCATION_CDMABS_LONG]              = { "modem.location.cdma-bs.longitude",                "longitude",                MMC_S_MODEM_LOCATION_CDMABS, },
+    [MMC_F_LOCATION_CDMABS_LAT]               = { "modem.location.cdma-bs.latitude",                 "latitude",                 MMC_S_MODEM_LOCATION_CDMABS, },
+    [MMC_F_FIRMWARE_LIST]                     = { "modem.firmware-list",                             "list",                     MMC_S_MODEM_FIRMWARE,        },
+    [MMC_F_BEARER_GENERAL_DBUS_PATH]          = { "bearer.dbus-path",                                "dbus path",                MMC_S_BEARER_GENERAL,        },
+    [MMC_F_BEARER_GENERAL_TYPE]               = { "bearer.type",                                     "type",                     MMC_S_BEARER_GENERAL,        },
+    [MMC_F_BEARER_STATUS_CONNECTED]           = { "bearer.status.connected",                         "connected",                MMC_S_BEARER_STATUS,         },
+    [MMC_F_BEARER_STATUS_SUSPENDED]           = { "bearer.status.suspended",                         "suspended",                MMC_S_BEARER_STATUS,         },
+    [MMC_F_BEARER_STATUS_INTERFACE]           = { "bearer.status.interface",                         "interface",                MMC_S_BEARER_STATUS,         },
+    [MMC_F_BEARER_STATUS_IP_TIMEOUT]          = { "bearer.status.ip-timeout",                        "ip timeout",               MMC_S_BEARER_STATUS,         },
+    [MMC_F_BEARER_PROPERTIES_APN]             = { "bearer.properties.apn",                           "apn",                      MMC_S_BEARER_PROPERTIES,     },
+    [MMC_F_BEARER_PROPERTIES_ROAMING]         = { "bearer.properties.roaming",                       "roaming",                  MMC_S_BEARER_PROPERTIES,     },
+    [MMC_F_BEARER_PROPERTIES_IP_TYPE]         = { "bearer.properties.ip-type",                       "ip type",                  MMC_S_BEARER_PROPERTIES,     },
+    [MMC_F_BEARER_PROPERTIES_USER]            = { "bearer.properties.user",                          "user",                     MMC_S_BEARER_PROPERTIES,     },
+    [MMC_F_BEARER_PROPERTIES_PASSWORD]        = { "bearer.properties.password",                      "password",                 MMC_S_BEARER_PROPERTIES,     },
+    [MMC_F_BEARER_PROPERTIES_NUMBER]          = { "bearer.properties.number",                        "number",                   MMC_S_BEARER_PROPERTIES,     },
+    [MMC_F_BEARER_PROPERTIES_RM_PROTOCOL]     = { "bearer.properties.rm-protocol",                   "rm protocol",              MMC_S_BEARER_PROPERTIES,     },
+    [MMC_F_BEARER_IPV4_CONFIG_METHOD]         = { "bearer.ipv4-config.method",                       "method",                   MMC_S_BEARER_IPV4_CONFIG,    },
+    [MMC_F_BEARER_IPV4_CONFIG_ADDRESS]        = { "bearer.ipv4-config.address",                      "address",                  MMC_S_BEARER_IPV4_CONFIG,    },
+    [MMC_F_BEARER_IPV4_CONFIG_PREFIX]         = { "bearer.ipv4-config.prefix",                       "prefix",                   MMC_S_BEARER_IPV4_CONFIG,    },
+    [MMC_F_BEARER_IPV4_CONFIG_GATEWAY]        = { "bearer.ipv4-config.gateway",                      "gateway",                  MMC_S_BEARER_IPV4_CONFIG,    },
+    [MMC_F_BEARER_IPV4_CONFIG_DNS]            = { "bearer.ipv4-config.dns",                          "dns",                      MMC_S_BEARER_IPV4_CONFIG,    },
+    [MMC_F_BEARER_IPV4_CONFIG_MTU]            = { "bearer.ipv4-config.mtu",                          "mtu",                      MMC_S_BEARER_IPV4_CONFIG,    },
+    [MMC_F_BEARER_IPV6_CONFIG_METHOD]         = { "bearer.ipv6-config.method",                       "method",                   MMC_S_BEARER_IPV6_CONFIG,    },
+    [MMC_F_BEARER_IPV6_CONFIG_ADDRESS]        = { "bearer.ipv6-config.address",                      "address",                  MMC_S_BEARER_IPV6_CONFIG,    },
+    [MMC_F_BEARER_IPV6_CONFIG_PREFIX]         = { "bearer.ipv6-config.prefix",                       "prefix",                   MMC_S_BEARER_IPV6_CONFIG,    },
+    [MMC_F_BEARER_IPV6_CONFIG_GATEWAY]        = { "bearer.ipv6-config.gateway",                      "gateway",                  MMC_S_BEARER_IPV6_CONFIG,    },
+    [MMC_F_BEARER_IPV6_CONFIG_DNS]            = { "bearer.ipv6-config.dns",                          "dns",                      MMC_S_BEARER_IPV6_CONFIG,    },
+    [MMC_F_BEARER_IPV6_CONFIG_MTU]            = { "bearer.ipv6-config.mtu",                          "mtu",                      MMC_S_BEARER_IPV6_CONFIG,    },
+    [MMC_F_BEARER_STATS_DURATION]             = { "bearer.stats.duration",                           "duration",                 MMC_S_BEARER_STATS,          },
+    [MMC_F_BEARER_STATS_BYTES_RX]             = { "bearer.stats.bytes-rx",                           "bytes rx",                 MMC_S_BEARER_STATS,          },
+    [MMC_F_BEARER_STATS_BYTES_TX]             = { "bearer.stats.bytes-tx",                           "bytes tx",                 MMC_S_BEARER_STATS,          },
+    [MMC_F_CALL_GENERAL_DBUS_PATH]            = { "call.dbus-path",                                  "dbus path",                MMC_S_CALL_GENERAL,          },
+    [MMC_F_CALL_PROPERTIES_NUMBER]            = { "call.properties.number",                          "number",                   MMC_S_CALL_PROPERTIES,       },
+    [MMC_F_CALL_PROPERTIES_DIRECTION]         = { "call.properties.direction",                       "direction",                MMC_S_CALL_PROPERTIES,       },
+    [MMC_F_CALL_PROPERTIES_STATE]             = { "call.properties.state",                           "state",                    MMC_S_CALL_PROPERTIES,       },
+    [MMC_F_CALL_PROPERTIES_STATE_REASON]      = { "call.properties.state-reason",                    "state reason",             MMC_S_CALL_PROPERTIES,       },
+    [MMC_F_CALL_PROPERTIES_AUDIO_PORT]        = { "call.properties.audio-port",                      "audio port",               MMC_S_CALL_PROPERTIES,       },
+    [MMC_F_CALL_AUDIO_FORMAT_ENCODING]        = { "call.audio-format.encoding",                      "encoding",                 MMC_S_CALL_AUDIO_FORMAT,     },
+    [MMC_F_CALL_AUDIO_FORMAT_RESOLUTION]      = { "call.audio-format.resolution",                    "resolution",               MMC_S_CALL_AUDIO_FORMAT,     },
+    [MMC_F_CALL_AUDIO_FORMAT_RATE]            = { "call.audio-format.rate",                          "rate",                     MMC_S_CALL_AUDIO_FORMAT,     },
+    [MMC_F_SMS_GENERAL_DBUS_PATH]             = { "sms.dbus-path",                                   "dbus path",                MMC_S_SMS_GENERAL,           },
+    [MMC_F_SMS_CONTENT_NUMBER]                = { "sms.content.number",                              "number",                   MMC_S_SMS_CONTENT,           },
+    [MMC_F_SMS_CONTENT_TEXT]                  = { "sms.content.text",                                "text",                     MMC_S_SMS_CONTENT,           },
+    [MMC_F_SMS_CONTENT_DATA]                  = { "sms.content.data",                                "data",                     MMC_S_SMS_CONTENT,           },
+    [MMC_F_SMS_PROPERTIES_PDU_TYPE]           = { "sms.properties.pdu-type",                         "pdu type",                 MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_STATE]              = { "sms.properties.state",                            "state",                    MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_VALIDITY]           = { "sms.properties.validity",                         "validity",                 MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_STORAGE]            = { "sms.properties.storage",                          "storage",                  MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_SMSC]               = { "sms.properties.smsc",                             "smsc",                     MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_CLASS]              = { "sms.properties.class",                            "class",                    MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_TELESERVICE_ID]     = { "sms.properties.teleservice-id",                   "teleservice id",           MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_SERVICE_CATEGORY]   = { "sms.properties.service-category",                 "service category",         MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_DELIVERY_REPORT]    = { "sms.properties.delivery-report",                  "delivery report",          MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_MSG_REFERENCE]      = { "sms.properties.message-reference",                "message reference",        MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_TIMESTAMP]          = { "sms.properties.timestamp",                        "timestamp",                MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_DELIVERY_STATE]     = { "sms.properties.delivery-state",                   "delivery state",           MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SMS_PROPERTIES_DISCH_TIMESTAMP]    = { "sms.properties.discharge-timestamp",              "discharge timestamp",      MMC_S_SMS_PROPERTIES,        },
+    [MMC_F_SIM_GENERAL_DBUS_PATH]             = { "sim.dbus-path",                                   "dbus path",                MMC_S_SIM_GENERAL,           },
+    [MMC_F_SIM_PROPERTIES_IMSI]               = { "sim.properties.imsi",                             "imsi",                     MMC_S_SIM_PROPERTIES,        },
+    [MMC_F_SIM_PROPERTIES_ICCID]              = { "sim.properties.iccid",                            "iccid",                    MMC_S_SIM_PROPERTIES,        },
+    [MMC_F_SIM_PROPERTIES_OPERATOR_ID]        = { "sim.properties.operator-code",                    "operator id",              MMC_S_SIM_PROPERTIES,        },
+    [MMC_F_SIM_PROPERTIES_OPERATOR_NAME]      = { "sim.properties.operator-name",                    "operator name",            MMC_S_SIM_PROPERTIES,        },
+    [MMC_F_MODEM_LIST_DBUS_PATH]              = { "modem-list",                                      "modems",                   MMC_S_UNKNOWN,               },
+    [MMC_F_SMS_LIST_DBUS_PATH]                = { "modem.messaging.sms",                             "sms messages",             MMC_S_UNKNOWN,               },
+    [MMC_F_CALL_LIST_DBUS_PATH]               = { "modem.voice.call",                                "calls",                    MMC_S_UNKNOWN,               },
 };
 
 /******************************************************************************/
diff --git a/cli/mmcli-output.h b/cli/mmcli-output.h
index 80fbda0a..362e4274 100644
--- a/cli/mmcli-output.h
+++ b/cli/mmcli-output.h
@@ -129,6 +129,10 @@ typedef enum {
     /* 3GPP EPS section */
     MMC_F_3GPP_EPS_UE_MODE,
     MMC_F_3GPP_EPS_INITIAL_BEARER_PATH,
+    MMC_F_3GPP_EPS_BEARER_SETTINGS_APN,
+    MMC_F_3GPP_EPS_BEARER_SETTINGS_IP_TYPE,
+    MMC_F_3GPP_EPS_BEARER_SETTINGS_USER,
+    MMC_F_3GPP_EPS_BEARER_SETTINGS_PASSWORD,
     /* 3GPP scan section */
     MMC_F_3GPP_SCAN_NETWORKS,
     /* USSD section */
diff --git a/docs/reference/libmm-glib/libmm-glib-sections.txt b/docs/reference/libmm-glib/libmm-glib-sections.txt
index 5d60c952..230e3ddf 100644
--- a/docs/reference/libmm-glib/libmm-glib-sections.txt
+++ b/docs/reference/libmm-glib/libmm-glib-sections.txt
@@ -284,6 +284,8 @@ mm_modem_3gpp_dup_initial_eps_bearer_path
 mm_modem_3gpp_get_initial_eps_bearer
 mm_modem_3gpp_get_initial_eps_bearer_finish
 mm_modem_3gpp_get_initial_eps_bearer_sync
+mm_modem_3gpp_get_initial_eps_bearer_settings
+mm_modem_3gpp_peek_initial_eps_bearer_settings
 <SUBSECTION Methods>
 mm_modem_3gpp_register
 mm_modem_3gpp_register_finish
@@ -1770,6 +1772,8 @@ mm_gdbus_modem3gpp_get_pco
 mm_gdbus_modem3gpp_dup_pco
 mm_gdbus_modem3gpp_get_initial_eps_bearer
 mm_gdbus_modem3gpp_dup_initial_eps_bearer
+mm_gdbus_modem3gpp_get_initial_eps_bearer_settings
+mm_gdbus_modem3gpp_dup_initial_eps_bearer_settings
 <SUBSECTION Methods>
 mm_gdbus_modem3gpp_call_register
 mm_gdbus_modem3gpp_call_register_finish
@@ -1795,6 +1799,7 @@ mm_gdbus_modem3gpp_set_subscription_state
 mm_gdbus_modem3gpp_set_eps_ue_mode_operation
 mm_gdbus_modem3gpp_set_pco
 mm_gdbus_modem3gpp_set_initial_eps_bearer
+mm_gdbus_modem3gpp_set_initial_eps_bearer_settings
 <SUBSECTION Standard>
 MM_GDBUS_IS_MODEM3GPP
 MM_GDBUS_MODEM3GPP
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml b/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml
index 758fb32d..f58683f6 100644
--- a/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml
+++ b/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml
@@ -182,5 +182,18 @@
     -->
     <property name="InitialEpsBearer" type="o" access="read" />
 
+    <!--
+        InitialEpsBearerSettings:
+
+        List of properties requested by the device for the initial EPS bearer during
+        LTE network attach procedure.
+
+        The network may decide to use different settings during the actual device attach
+        procedure, e.g. if the device is roaming or no explicit settings were requested,
+        so the properties shown in the #org.freedesktop.ModemManager1.Modem.Modem3gpp.InitialEpsBearer:InitialEpsBearer
+        may be totally different.
+    -->
+    <property name="InitialEpsBearerSettings" type="a{sv}" access="read" />
+
   </interface>
 </node>
diff --git a/libmm-glib/mm-modem-3gpp.c b/libmm-glib/mm-modem-3gpp.c
index a30f2a6c..9be4cece 100644
--- a/libmm-glib/mm-modem-3gpp.c
+++ b/libmm-glib/mm-modem-3gpp.c
@@ -43,6 +43,13 @@
 
 G_DEFINE_TYPE (MMModem3gpp, mm_modem_3gpp, MM_GDBUS_TYPE_MODEM3GPP_PROXY)
 
+struct _MMModem3gppPrivate {
+    /* Properties */
+    GMutex              initial_eps_bearer_settings_mutex;
+    guint               initial_eps_bearer_settings_id;
+    MMBearerProperties *initial_eps_bearer_settings;
+};
+
 /*****************************************************************************/
 
 /**
@@ -567,6 +574,117 @@ mm_modem_3gpp_network_get_access_technology (const MMModem3gppNetwork *network)
 
 /*****************************************************************************/
 
+static void
+initial_eps_bearer_settings_updated (MMModem3gpp *self,
+                                     GParamSpec  *pspec)
+{
+    g_mutex_lock (&self->priv->initial_eps_bearer_settings_mutex);
+    {
+        GVariant *dictionary;
+
+        g_clear_object (&self->priv->initial_eps_bearer_settings);
+
+        dictionary = mm_gdbus_modem3gpp_get_initial_eps_bearer_settings (MM_GDBUS_MODEM3GPP (self));
+        if (dictionary) {
+            GError *error = NULL;
+
+            self->priv->initial_eps_bearer_settings = mm_bearer_properties_new_from_dictionary (dictionary, &error);
+            if (error) {
+                g_warning ("Invalid bearer properties received: %s", error->message);
+                g_error_free (error);
+            }
+        }
+    }
+    g_mutex_unlock (&self->priv->initial_eps_bearer_settings_mutex);
+}
+
+static void
+ensure_internal_initial_eps_bearer_settings (MMModem3gpp         *self,
+                                             MMBearerProperties **dup)
+{
+    g_mutex_lock (&self->priv->initial_eps_bearer_settings_mutex);
+    {
+        /* If this is the first time ever asking for the object, setup the
+         * update listener and the initial object, if any. */
+        if (!self->priv->initial_eps_bearer_settings_id) {
+            GVariant *dictionary;
+
+            dictionary = mm_gdbus_modem3gpp_dup_initial_eps_bearer_settings (MM_GDBUS_MODEM3GPP (self));
+            if (dictionary) {
+                GError *error = NULL;
+
+                self->priv->initial_eps_bearer_settings = mm_bearer_properties_new_from_dictionary (dictionary, &error);
+                if (error) {
+                    g_warning ("Invalid initial bearer properties: %s", error->message);
+                    g_error_free (error);
+                }
+                g_variant_unref (dictionary);
+            }
+
+            /* No need to clear this signal connection when freeing self */
+            self->priv->initial_eps_bearer_settings_id =
+                g_signal_connect (self,
+                                  "notify::initial-eps-bearer-properties",
+                                  G_CALLBACK (initial_eps_bearer_settings_updated),
+                                  NULL);
+        }
+
+        if (dup && self->priv->initial_eps_bearer_settings)
+            *dup = g_object_ref (self->priv->initial_eps_bearer_settings);
+    }
+    g_mutex_unlock (&self->priv->initial_eps_bearer_settings_mutex);
+}
+
+/**
+ * mm_modem_3gpp_get_initial_eps_bearer_settings:
+ * @self: A #MMModem3gpp.
+ *
+ * Gets a #MMBearerProperties object specifying the settings configured in
+ * the device to use when attaching to the LTE network.
+ *
+ * <warning>The values reported by @self are not updated when the values in the
+ * interface change. Instead, the client is expected to call
+ * mm_modem_3gpp_get_initial_eps_bearer_settings() again to get a new #MMBearerProperties with the
+ * new values.</warning>
+ *
+ * Returns: (transfer full): A #MMBearerProperties that must be freed with g_object_unref() or %NULL if unknown.
+ */
+MMBearerProperties *
+mm_modem_3gpp_get_initial_eps_bearer_settings (MMModem3gpp *self)
+{
+    MMBearerProperties *props = NULL;
+
+    g_return_val_if_fail (MM_IS_MODEM_3GPP (self), NULL);
+
+    ensure_internal_initial_eps_bearer_settings (self, &props);
+    return props;
+}
+
+/**
+ * mm_modem_3gpp_peek_initial_eps_bearer_settings:
+ * @self: A #MMModem3gpp.
+ *
+ * Gets a #MMBearerProperties object specifying the settings configured in
+ * the device to use when attaching to the LTE network.
+ *
+ * <warning>The returned value is only valid until the property changes so
+ * it is only safe to use this function on the thread where
+ * @self was constructed. Use mm_modem_3gpp_get_initial_eps_bearer_settings() if on another
+ * thread.</warning>
+ *
+ * Returns: (transfer none): A #MMBearerProperties. Do not free the returned value, it belongs to @self.
+ */
+MMBearerProperties *
+mm_modem_3gpp_peek_initial_eps_bearer_settings (MMModem3gpp *self)
+{
+    g_return_val_if_fail (MM_IS_MODEM_3GPP (self), NULL);
+
+    ensure_internal_initial_eps_bearer_settings (self, NULL);
+    return self->priv->initial_eps_bearer_settings;
+}
+
+/*****************************************************************************/
+
 static GList *
 create_networks_list (GVariant *variant)
 {
@@ -914,9 +1032,38 @@ mm_modem_3gpp_get_initial_eps_bearer_sync (MMModem3gpp   *self,
 static void
 mm_modem_3gpp_init (MMModem3gpp *self)
 {
+    self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MM_TYPE_MODEM_3GPP, MMModem3gppPrivate);
+    g_mutex_init (&self->priv->initial_eps_bearer_settings_mutex);
+}
+
+static void
+finalize (GObject *object)
+{
+    MMModem3gpp *self = MM_MODEM_3GPP (object);
+
+    g_mutex_clear (&self->priv->initial_eps_bearer_settings_mutex);
+
+    G_OBJECT_CLASS (mm_modem_3gpp_parent_class)->finalize (object);
+}
+
+static void
+dispose (GObject *object)
+{
+    MMModem3gpp *self = MM_MODEM_3GPP (object);
+
+    g_clear_object (&self->priv->initial_eps_bearer_settings);
+
+    G_OBJECT_CLASS (mm_modem_3gpp_parent_class)->dispose (object);
 }
 
 static void
 mm_modem_3gpp_class_init (MMModem3gppClass *modem_class)
 {
+    GObjectClass *object_class = G_OBJECT_CLASS (modem_class);
+
+    g_type_class_add_private (object_class, sizeof (MMModem3gppPrivate));
+
+    /* Virtual methods */
+    object_class->dispose  = dispose;
+    object_class->finalize = finalize;
 }
diff --git a/libmm-glib/mm-modem-3gpp.h b/libmm-glib/mm-modem-3gpp.h
index 6d87a47d..ce7df740 100644
--- a/libmm-glib/mm-modem-3gpp.h
+++ b/libmm-glib/mm-modem-3gpp.h
@@ -44,6 +44,7 @@ G_BEGIN_DECLS
 
 typedef struct _MMModem3gpp MMModem3gpp;
 typedef struct _MMModem3gppClass MMModem3gppClass;
+typedef struct _MMModem3gppPrivate MMModem3gppPrivate;
 
 /**
  * MMModem3gpp:
@@ -53,8 +54,8 @@ typedef struct _MMModem3gppClass MMModem3gppClass;
  */
 struct _MMModem3gpp {
     /*< private >*/
-    MmGdbusModem3gppProxy parent;
-    gpointer unused;
+    MmGdbusModem3gppProxy  parent;
+    MMModem3gppPrivate    *priv;
 };
 
 struct _MMModem3gppClass {
@@ -87,6 +88,9 @@ GList       *mm_modem_3gpp_get_pco (MMModem3gpp *self);
 const gchar *mm_modem_3gpp_get_initial_eps_bearer_path (MMModem3gpp *self);
 gchar       *mm_modem_3gpp_dup_initial_eps_bearer_path (MMModem3gpp *self);
 
+MMBearerProperties *mm_modem_3gpp_get_initial_eps_bearer_settings  (MMModem3gpp *self);
+MMBearerProperties *mm_modem_3gpp_peek_initial_eps_bearer_settings (MMModem3gpp *self);
+
 void     mm_modem_3gpp_register        (MMModem3gpp *self,
                                         const gchar *network_id,
                                         GCancellable *cancellable,
diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c
index a90c7204..5966b4c1 100644
--- a/src/mm-iface-modem-3gpp.c
+++ b/src/mm-iface-modem-3gpp.c
@@ -2049,6 +2049,7 @@ typedef enum {
     INITIALIZATION_STEP_IMEI,
     INITIALIZATION_STEP_ENABLED_FACILITY_LOCKS,
     INITIALIZATION_STEP_EPS_UE_MODE_OPERATION,
+    INITIALIZATION_STEP_EPS_INITIAL_BEARER_SETTINGS,
     INITIALIZATION_STEP_LAST
 } InitializationStep;
 
@@ -2081,6 +2082,36 @@ sim_pin_lock_enabled_cb (MMBaseSim *self,
 }
 
 static void
+load_initial_eps_bearer_settings_ready (MMIfaceModem3gpp *self,
+                                        GAsyncResult     *res,
+                                        GTask            *task)
+{
+    InitializationContext *ctx;
+    MMBearerProperties    *config;
+    GError                *error = NULL;
+
+    ctx = g_task_get_task_data (task);
+
+    config = MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_initial_eps_bearer_settings_finish (self, res, &error);
+    if (!config) {
+        mm_warn ("couldn't load initial EPS bearer settings: '%s'", error->message);
+        g_error_free (error);
+    } else {
+        GVariant *dictionary;
+
+        dictionary = mm_bearer_properties_get_dictionary (config);
+        mm_gdbus_modem3gpp_set_initial_eps_bearer_settings (ctx->skeleton, dictionary);
+        g_object_unref (config);
+        if (dictionary)
+            g_variant_unref (dictionary);
+    }
+
+    /* Go on to next step */
+    ctx->step++;
+    interface_initialization_step (task);
+}
+
+static void
 load_eps_ue_mode_operation_ready (MMIfaceModem3gpp *self,
                                   GAsyncResult     *res,
                                   GTask            *task)
@@ -2228,6 +2259,19 @@ interface_initialization_step (GTask *task)
         /* Fall down to next step */
         ctx->step++;
 
+    case INITIALIZATION_STEP_EPS_INITIAL_BEARER_SETTINGS:
+        if (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_initial_eps_bearer_settings &&
+            MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_initial_eps_bearer_settings_finish) {
+            MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->load_initial_eps_bearer_settings (
+                self,
+                (GAsyncReadyCallback)load_initial_eps_bearer_settings_ready,
+                task);
+            return;
+        }
+        /* Fall down to next step */
+        ctx->step++;
+
+
     case INITIALIZATION_STEP_LAST:
         /* We are done without errors! */
 
diff --git a/src/mm-iface-modem-3gpp.h b/src/mm-iface-modem-3gpp.h
index 90b3eedd..66bf4cdd 100644
--- a/src/mm-iface-modem-3gpp.h
+++ b/src/mm-iface-modem-3gpp.h
@@ -155,6 +155,14 @@ struct _MMIfaceModem3gpp {
                                                             GAsyncResult         *res,
                                                             GError              **error);
 
+    /* Asynchronous initial default EPS bearer settings loading */
+    void                 (*load_initial_eps_bearer_settings)        (MMIfaceModem3gpp     *self,
+                                                                     GAsyncReadyCallback   callback,
+                                                                     gpointer              user_data);
+    MMBearerProperties * (*load_initial_eps_bearer_settings_finish) (MMIfaceModem3gpp     *self,
+                                                                     GAsyncResult         *res,
+                                                                     GError              **error);
+
     /* Create initial default EPS bearer object */
     MMBaseBearer * (*create_initial_eps_bearer) (MMIfaceModem3gpp   *self,
                                                  MMBearerProperties *properties);