api,bearer: new 'ConnectionError' property

This new property will provide detailed information about the failed
connection attempt, or about the network initiated disconnection. The
property will be cleared only if a new connection attempt is
triggered, and so it can be used to investigate why a given attempt
failed without needing to be the one who triggered the attempt (e.g.
so that failures in NetworkManager-triggered connection attempts can
be investigated looking at the DBus API).

The property is built as a (ss) tuple, but the libmm-glib interface
provides methods to read this property as a GError.

9 files changed, 410 insertions, 213 deletions

diff --git a/cli/mmcli-bearer.c b/cli/mmcli-bearer.c
index 54d2d4c7..54da4ff9 100644
--- a/cli/mmcli-bearer.c
+++ b/cli/mmcli-bearer.c
@@ -133,30 +133,34 @@ mmcli_bearer_shutdown (void)
 static void
 print_bearer_info (MMBearer *bearer)
 {
-    MMBearerIpConfig   *ipv4_config;
-    MMBearerIpConfig   *ipv6_config;
-    MMBearerProperties *properties;
-    MMBearerStats      *stats;
-    gint                profile_id;
-    gchar              *profile_id_str;
-
-    ipv4_config = mm_bearer_get_ipv4_config (bearer);
-    ipv6_config = mm_bearer_get_ipv6_config (bearer);
-    properties  = mm_bearer_get_properties (bearer);
-    stats       = mm_bearer_get_stats (bearer);
-    profile_id  = mm_bearer_get_profile_id (bearer);
+    g_autoptr(MMBearerIpConfig)    ipv4_config = NULL;
+    g_autoptr(MMBearerIpConfig)    ipv6_config = NULL;
+    g_autoptr(MMBearerProperties)  properties = NULL;
+    g_autoptr(MMBearerStats)       stats = NULL;
+    g_autoptr(GError)              connection_error = NULL;
+    gint                           profile_id;
+    gchar                         *profile_id_str;
+
+    ipv4_config      = mm_bearer_get_ipv4_config (bearer);
+    ipv6_config      = mm_bearer_get_ipv6_config (bearer);
+    properties       = mm_bearer_get_properties (bearer);
+    stats            = mm_bearer_get_stats (bearer);
+    profile_id       = mm_bearer_get_profile_id (bearer);
+    connection_error = mm_bearer_get_connection_error (bearer);
 
     profile_id_str = (profile_id != MM_3GPP_PROFILE_ID_UNKNOWN) ? g_strdup_printf ("%d", profile_id) : NULL;
 
     mmcli_output_string      (MMC_F_BEARER_GENERAL_DBUS_PATH, mm_bearer_get_path (bearer));
     mmcli_output_string      (MMC_F_BEARER_GENERAL_TYPE,      mm_bearer_type_get_string (mm_bearer_get_bearer_type (bearer)));
 
-    mmcli_output_string      (MMC_F_BEARER_STATUS_CONNECTED,   mm_bearer_get_connected (bearer) ? "yes" : "no");
-    mmcli_output_string      (MMC_F_BEARER_STATUS_SUSPENDED,   mm_bearer_get_suspended (bearer) ? "yes" : "no");
-    mmcli_output_string      (MMC_F_BEARER_STATUS_MULTIPLEXED, mm_bearer_get_multiplexed (bearer) ? "yes" : "no");
-    mmcli_output_string      (MMC_F_BEARER_STATUS_INTERFACE,   mm_bearer_get_interface (bearer));
-    mmcli_output_string_take (MMC_F_BEARER_STATUS_IP_TIMEOUT,  g_strdup_printf ("%u", mm_bearer_get_ip_timeout (bearer)));
-    mmcli_output_string_take (MMC_F_BEARER_STATUS_PROFILE_ID,  profile_id_str);
+    mmcli_output_string      (MMC_F_BEARER_STATUS_CONNECTED,                mm_bearer_get_connected (bearer) ? "yes" : "no");
+    mmcli_output_string_take (MMC_F_BEARER_STATUS_CONNECTION_ERROR_NAME,    connection_error ? g_dbus_error_encode_gerror (connection_error) : NULL);
+    mmcli_output_string      (MMC_F_BEARER_STATUS_CONNECTION_ERROR_MESSAGE, connection_error ? connection_error->message : NULL);
+    mmcli_output_string      (MMC_F_BEARER_STATUS_SUSPENDED,                mm_bearer_get_suspended (bearer) ? "yes" : "no");
+    mmcli_output_string      (MMC_F_BEARER_STATUS_MULTIPLEXED,              mm_bearer_get_multiplexed (bearer) ? "yes" : "no");
+    mmcli_output_string      (MMC_F_BEARER_STATUS_INTERFACE,                mm_bearer_get_interface (bearer));
+    mmcli_output_string_take (MMC_F_BEARER_STATUS_IP_TIMEOUT,               g_strdup_printf ("%u", mm_bearer_get_ip_timeout (bearer)));
+    mmcli_output_string_take (MMC_F_BEARER_STATUS_PROFILE_ID,               profile_id_str);
 
     /* Properties */
     {
@@ -315,11 +319,6 @@ print_bearer_info (MMBearer *bearer)
     }
 
     mmcli_output_dump ();
-
-    g_clear_object (&stats);
-    g_clear_object (&properties);
-    g_clear_object (&ipv4_config);
-    g_clear_object (&ipv6_config);
 }
 
 static void
diff --git a/cli/mmcli-output.c b/cli/mmcli-output.c
index 9eb30056..0d1fbf63 100644
--- a/cli/mmcli-output.c
+++ b/cli/mmcli-output.c
@@ -95,195 +95,197 @@ typedef struct {
 } FieldInfo;
 
 static FieldInfo field_infos[] = {
-    [MMC_F_GENERAL_DBUS_PATH]                 = { "modem.dbus-path",                                 "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",                          "firmware revision",        MMC_S_MODEM_HARDWARE,             },
-    [MMC_F_HARDWARE_CARRIER_CONF]             = { "modem.generic.carrier-configuration",             "carrier config",           MMC_S_MODEM_HARDWARE,             },
-    [MMC_F_HARDWARE_CARRIER_CONF_REV]         = { "modem.generic.carrier-configuration-revision",    "carrier config 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 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_3GPP_PROFILE_MANAGER_LIST]         = { "modem.3gpp.profile-manager.list",                 "list",                     MMC_S_MODEM_3GPP_PROFILE_MANAGER, },
-    [MMC_F_3GPP_PROFILE_MANAGER_SET]          = { "modem.3gpp.profile-manager.set",                  "set",                      MMC_S_MODEM_3GPP_PROFILE_MANAGER, },
-    [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",                               "primary sim path",         MMC_S_MODEM_SIM,                  },
-    [MMC_F_SIM_PRIMARY_SLOT]                  = { "modem.generic.primary-sim-slot",                  NULL,                       MMC_S_MODEM_SIM,                  },
-    [MMC_F_SIM_SLOT_PATHS]                    = { "modem.generic.sim-slots",                         "sim slot paths",           MMC_S_MODEM_SIM,                  },
-    [MMC_F_BEARER_PATHS]                      = { "modem.generic.bearers",                           "paths",                    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_SIGNAL_5G_RSRQ]                    = { "modem.signal.5g.rsrq",                            "rsrq",                     MMC_S_MODEM_SIGNAL_5G,            },
-    [MMC_F_SIGNAL_5G_RSRP]                    = { "modem.signal.5g.rsrp",                            "rsrp",                     MMC_S_MODEM_SIGNAL_5G,            },
-    [MMC_F_SIGNAL_5G_SNR]                     = { "modem.signal.5g.snr",                             "s/n",                      MMC_S_MODEM_SIGNAL_5G,            },
-    [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_FIRMWARE_METHOD]                   = { "modem.firmware.method",                           "method",                   MMC_S_MODEM_FIRMWARE,             },
-    [MMC_F_FIRMWARE_DEVICE_IDS]               = { "modem.firmware.device-ids",                       "device ids",               MMC_S_MODEM_FIRMWARE,             },
-    [MMC_F_FIRMWARE_VERSION]                  = { "modem.firmware.version",                          "version",                  MMC_S_MODEM_FIRMWARE,             },
-    [MMC_F_FIRMWARE_FASTBOOT_AT]              = { "modem.firmware.fastboot.at",                      "at command",               MMC_S_MODEM_FIRMWARE_FASTBOOT,    },
-    [MMC_F_VOICE_EMERGENCY_ONLY]              = { "modem.voice.emergency-only",                      "emergency only",           MMC_S_MODEM_VOICE,                },
-    [MMC_F_BEARER_GENERAL_DBUS_PATH]          = { "bearer.dbus-path",                                "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_MULTIPLEXED]         = { "bearer.status.multiplexed",                       "multiplexed",              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_STATUS_PROFILE_ID]          = { "bearer.status.profile-id",                        "profile id",               MMC_S_BEARER_STATUS,              },
-    [MMC_F_BEARER_PROPERTIES_APN]             = { "bearer.properties.apn",                           "apn",                      MMC_S_BEARER_PROPERTIES,          },
-    [MMC_F_BEARER_PROPERTIES_APN_TYPE]        = { "bearer.properties.apn-type",                      "apn type",                 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_ALLOWED_AUTH]    = { "bearer.properties.allowed-auth",                  "allowed-auth",             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_PROFILE_ID]      = { "bearer.properties.profile-id",                    "profile id",               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_BEARER_STATS_ATTEMPTS]             = { "bearer.stats.attempts",                           "attempts",                 MMC_S_BEARER_STATS,               },
-    [MMC_F_BEARER_STATS_FAILED_ATTEMPTS]      = { "bearer.stats.failed-attempts",                    "attempts",                 MMC_S_BEARER_STATS,               },
-    [MMC_F_BEARER_STATS_TOTAL_DURATION]       = { "bearer.stats.total-duration",                     "total-duration",           MMC_S_BEARER_STATS,               },
-    [MMC_F_BEARER_STATS_TOTAL_BYTES_RX]       = { "bearer.stats.total-bytes-rx",                     "total-bytes rx",           MMC_S_BEARER_STATS,               },
-    [MMC_F_BEARER_STATS_TOTAL_BYTES_TX]       = { "bearer.stats.total-bytes-tx",                     "total-bytes tx",           MMC_S_BEARER_STATS,               },
-    [MMC_F_CALL_GENERAL_DBUS_PATH]            = { "call.dbus-path",                                  "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_MULTIPARTY]        = { "call.properties.multiparty",                      "multiparty",               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",                                   "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",                                   "path",                     MMC_S_SIM_GENERAL,                },
-    [MMC_F_SIM_PROPERTIES_ACTIVE]             = { "sim.properties.active",                           "active",                   MMC_S_SIM_PROPERTIES,             },
-    [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_EID]                = { "sim.properties.eid",                              "eid",                      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_SIM_PROPERTIES_EMERGENCY_NUMBERS]  = { "sim.properties.emergency-numbers",                "emergency numbers",        MMC_S_SIM_PROPERTIES,             },
-    [MMC_F_SIM_PROPERTIES_PREFERRED_NETWORKS] = { "sim.properties.preferred-networks",               "preferred networks",       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",                                 "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",                          "firmware revision",        MMC_S_MODEM_HARDWARE,             },
+    [MMC_F_HARDWARE_CARRIER_CONF]                  = { "modem.generic.carrier-configuration",             "carrier config",           MMC_S_MODEM_HARDWARE,             },
+    [MMC_F_HARDWARE_CARRIER_CONF_REV]              = { "modem.generic.carrier-configuration-revision",    "carrier config 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 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_3GPP_PROFILE_MANAGER_LIST]              = { "modem.3gpp.profile-manager.list",                 "list",                     MMC_S_MODEM_3GPP_PROFILE_MANAGER, },
+    [MMC_F_3GPP_PROFILE_MANAGER_SET]               = { "modem.3gpp.profile-manager.set",                  "set",                      MMC_S_MODEM_3GPP_PROFILE_MANAGER, },
+    [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",                               "primary sim path",         MMC_S_MODEM_SIM,                  },
+    [MMC_F_SIM_PRIMARY_SLOT]                       = { "modem.generic.primary-sim-slot",                  NULL,                       MMC_S_MODEM_SIM,                  },
+    [MMC_F_SIM_SLOT_PATHS]                         = { "modem.generic.sim-slots",                         "sim slot paths",           MMC_S_MODEM_SIM,                  },
+    [MMC_F_BEARER_PATHS]                           = { "modem.generic.bearers",                           "paths",                    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_SIGNAL_5G_RSRQ]                         = { "modem.signal.5g.rsrq",                            "rsrq",                     MMC_S_MODEM_SIGNAL_5G,            },
+    [MMC_F_SIGNAL_5G_RSRP]                         = { "modem.signal.5g.rsrp",                            "rsrp",                     MMC_S_MODEM_SIGNAL_5G,            },
+    [MMC_F_SIGNAL_5G_SNR]                          = { "modem.signal.5g.snr",                             "s/n",                      MMC_S_MODEM_SIGNAL_5G,            },
+    [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_FIRMWARE_METHOD]                        = { "modem.firmware.method",                           "method",                   MMC_S_MODEM_FIRMWARE,             },
+    [MMC_F_FIRMWARE_DEVICE_IDS]                    = { "modem.firmware.device-ids",                       "device ids",               MMC_S_MODEM_FIRMWARE,             },
+    [MMC_F_FIRMWARE_VERSION]                       = { "modem.firmware.version",                          "version",                  MMC_S_MODEM_FIRMWARE,             },
+    [MMC_F_FIRMWARE_FASTBOOT_AT]                   = { "modem.firmware.fastboot.at",                      "at command",               MMC_S_MODEM_FIRMWARE_FASTBOOT,    },
+    [MMC_F_VOICE_EMERGENCY_ONLY]                   = { "modem.voice.emergency-only",                      "emergency only",           MMC_S_MODEM_VOICE,                },
+    [MMC_F_BEARER_GENERAL_DBUS_PATH]               = { "bearer.dbus-path",                                "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_CONNECTION_ERROR_NAME]    = { "bearer.status.connection-error.name",             "connection error name",    MMC_S_BEARER_STATUS,              },
+    [MMC_F_BEARER_STATUS_CONNECTION_ERROR_MESSAGE] = { "bearer.status.connection-error.message",          "connection error message", MMC_S_BEARER_STATUS,              },
+    [MMC_F_BEARER_STATUS_SUSPENDED]                = { "bearer.status.suspended",                         "suspended",                MMC_S_BEARER_STATUS,              },
+    [MMC_F_BEARER_STATUS_MULTIPLEXED]              = { "bearer.status.multiplexed",                       "multiplexed",              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_STATUS_PROFILE_ID]               = { "bearer.status.profile-id",                        "profile id",               MMC_S_BEARER_STATUS,              },
+    [MMC_F_BEARER_PROPERTIES_APN]                  = { "bearer.properties.apn",                           "apn",                      MMC_S_BEARER_PROPERTIES,          },
+    [MMC_F_BEARER_PROPERTIES_APN_TYPE]             = { "bearer.properties.apn-type",                      "apn type",                 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_ALLOWED_AUTH]         = { "bearer.properties.allowed-auth",                  "allowed-auth",             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_PROFILE_ID]           = { "bearer.properties.profile-id",                    "profile id",               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_BEARER_STATS_ATTEMPTS]                  = { "bearer.stats.attempts",                           "attempts",                 MMC_S_BEARER_STATS,               },
+    [MMC_F_BEARER_STATS_FAILED_ATTEMPTS]           = { "bearer.stats.failed-attempts",                    "attempts",                 MMC_S_BEARER_STATS,               },
+    [MMC_F_BEARER_STATS_TOTAL_DURATION]            = { "bearer.stats.total-duration",                     "total-duration",           MMC_S_BEARER_STATS,               },
+    [MMC_F_BEARER_STATS_TOTAL_BYTES_RX]            = { "bearer.stats.total-bytes-rx",                     "total-bytes rx",           MMC_S_BEARER_STATS,               },
+    [MMC_F_BEARER_STATS_TOTAL_BYTES_TX]            = { "bearer.stats.total-bytes-tx",                     "total-bytes tx",           MMC_S_BEARER_STATS,               },
+    [MMC_F_CALL_GENERAL_DBUS_PATH]                 = { "call.dbus-path",                                  "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_MULTIPARTY]             = { "call.properties.multiparty",                      "multiparty",               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",                                   "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",                                   "path",                     MMC_S_SIM_GENERAL,                },
+    [MMC_F_SIM_PROPERTIES_ACTIVE]                  = { "sim.properties.active",                           "active",                   MMC_S_SIM_PROPERTIES,             },
+    [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_EID]                     = { "sim.properties.eid",                              "eid",                      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_SIM_PROPERTIES_EMERGENCY_NUMBERS]       = { "sim.properties.emergency-numbers",                "emergency numbers",        MMC_S_SIM_PROPERTIES,             },
+    [MMC_F_SIM_PROPERTIES_PREFERRED_NETWORKS]      = { "sim.properties.preferred-networks",               "preferred networks",       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 28754cd8..362230b3 100644
--- a/cli/mmcli-output.h
+++ b/cli/mmcli-output.h
@@ -227,6 +227,8 @@ typedef enum {
     MMC_F_BEARER_GENERAL_TYPE,
     /* Bearer status section */
     MMC_F_BEARER_STATUS_CONNECTED,
+    MMC_F_BEARER_STATUS_CONNECTION_ERROR_NAME,
+    MMC_F_BEARER_STATUS_CONNECTION_ERROR_MESSAGE,
     MMC_F_BEARER_STATUS_SUSPENDED,
     MMC_F_BEARER_STATUS_MULTIPLEXED,
     MMC_F_BEARER_STATUS_INTERFACE,
diff --git a/docs/reference/libmm-glib/libmm-glib-sections.txt b/docs/reference/libmm-glib/libmm-glib-sections.txt
index 670d42c7..70f55ace 100644
--- a/docs/reference/libmm-glib/libmm-glib-sections.txt
+++ b/docs/reference/libmm-glib/libmm-glib-sections.txt
@@ -1091,6 +1091,8 @@ mm_bearer_peek_properties
 mm_bearer_get_properties
 mm_bearer_peek_stats
 mm_bearer_get_stats
+mm_bearer_get_connection_error
+mm_bearer_peek_connection_error
 <SUBSECTION Methods>
 mm_bearer_connect
 mm_bearer_connect_finish
@@ -1835,6 +1837,8 @@ mm_gdbus_bearer_get_ip_timeout
 mm_gdbus_bearer_get_properties
 mm_gdbus_bearer_dup_properties
 mm_gdbus_bearer_get_connected
+mm_gdbus_bearer_get_connection_error
+mm_gdbus_bearer_dup_connection_error
 mm_gdbus_bearer_get_suspended
 mm_gdbus_bearer_get_multiplexed
 mm_gdbus_bearer_get_bearer_type
@@ -1851,6 +1855,7 @@ mm_gdbus_bearer_call_disconnect_sync
 <SUBSECTION Private>
 mm_gdbus_bearer_interface_info
 mm_gdbus_bearer_set_connected
+mm_gdbus_bearer_set_connection_error
 mm_gdbus_bearer_set_interface
 mm_gdbus_bearer_set_ip4_config
 mm_gdbus_bearer_set_ip6_config
diff --git a/introspection/org.freedesktop.ModemManager1.Bearer.xml b/introspection/org.freedesktop.ModemManager1.Bearer.xml
index 645f041c..b890195c 100644
--- a/introspection/org.freedesktop.ModemManager1.Bearer.xml
+++ b/introspection/org.freedesktop.ModemManager1.Bearer.xml
@@ -102,6 +102,20 @@
     <property name="Connected" type="b" access="read" />
 
     <!--
+        ConnectionError:
+
+        Provides additional information specifying the reason why the modem is
+	not connected (either due to a failed connection attempt, or due to a
+	a network initiated disconnection).
+
+        The value is composed of two strings: the registered DBus error name,
+	and an optional error message.
+
+        Since: 1.18
+    -->
+    <property name="ConnectionError" type="(ss)" access="read" />
+
+    <!--
         Suspended:
 
         In some devices, packet data service will be suspended while the device
diff --git a/libmm-glib/mm-bearer.c b/libmm-glib/mm-bearer.c
index 1c6a1cdd..cc50244c 100644
--- a/libmm-glib/mm-bearer.c
+++ b/libmm-glib/mm-bearer.c
@@ -22,6 +22,7 @@
  */
 
 #include "mm-helpers.h"
+#include "mm-common-helpers.h"
 #include "mm-bearer.h"
 
 /**
@@ -58,6 +59,11 @@ struct _MMBearerPrivate {
     GMutex stats_mutex;
     guint stats_id;
     MMBearerStats *stats;
+
+    /* Connection error */
+    GMutex connection_error_mutex;
+    guint connection_error_id;
+    GError *connection_error;
 };
 
 /*****************************************************************************/
@@ -757,6 +763,116 @@ mm_bearer_peek_stats (MMBearer *self)
 
 /*****************************************************************************/
 
+static void
+connection_error_updated (MMBearer   *self,
+                          GParamSpec *pspec)
+{
+    g_mutex_lock (&self->priv->connection_error_mutex);
+    {
+        GVariant *tuple;
+
+        g_clear_error (&self->priv->connection_error);
+
+        tuple = mm_gdbus_bearer_get_connection_error (MM_GDBUS_BEARER (self));
+        if (tuple) {
+            g_autoptr(GError) error = NULL;
+
+            self->priv->connection_error = mm_common_error_from_tuple (tuple, &error);
+            if (error)
+                g_warning ("Invalid bearer connection error update received: %s", error->message);
+        }
+    }
+    g_mutex_unlock (&self->priv->connection_error_mutex);
+}
+
+static void
+ensure_internal_connection_error (MMBearer  *self,
+                                  GError   **dup)
+{
+    g_mutex_lock (&self->priv->connection_error_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->connection_error_id) {
+            g_autoptr(GVariant) tuple = NULL;
+
+            tuple = mm_gdbus_bearer_dup_connection_error (MM_GDBUS_BEARER (self));
+            if (tuple) {
+                g_autoptr(GError) error = NULL;
+
+                self->priv->connection_error = mm_common_error_from_tuple (tuple, &error);
+                if (error)
+                    g_warning ("Invalid bearer connection error: %s", error->message);
+            }
+
+            /* No need to clear this signal connection when freeing self */
+            self->priv->connection_error_id =
+                g_signal_connect (self,
+                                  "notify::connection-error",
+                                  G_CALLBACK (connection_error_updated),
+                                  NULL);
+        }
+
+        if (dup && self->priv->connection_error)
+            *dup = g_error_copy (self->priv->connection_error);
+    }
+    g_mutex_unlock (&self->priv->connection_error_mutex);
+}
+
+/**
+ * mm_bearer_get_connection_error:
+ * @self: A #MMBearer.
+ *
+ * Gets a #GError specifying the connection error details, if any.
+ *
+ * <warning>The values reported by @self are not updated when the values in the
+ * interface change. Instead, the client is expected to call
+ * mm_bearer_get_connection_error() again to get a new #GError with the
+ * new values.</warning>
+ *
+ * Returns: (transfer full): A #GError that must be freed with
+ * g_error_free() or %NULL if none.
+ *
+ * Since: 1.18
+ */
+GError *
+mm_bearer_get_connection_error (MMBearer *self)
+{
+    GError *error = NULL;
+
+    g_return_val_if_fail (MM_IS_BEARER (self), NULL);
+
+    ensure_internal_connection_error (self, &error);
+    return error;
+}
+
+/**
+ * mm_bearer_peek_connection_error:
+ * @self: A #MMBearer.
+ *
+ * Gets a #GError specifying the connection error details, if any.
+ *
+ * <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_bearer_get_connection_error() if on another
+ * thread.</warning>
+ *
+ * Returns: (transfer none): A #GError, or %NULL if none. Do not
+ * free the returned value, it belongs to @self.
+ *
+ * Since: 1.18
+ */
+GError *
+mm_bearer_peek_connection_error (MMBearer *self)
+{
+    g_return_val_if_fail (MM_IS_BEARER (self), NULL);
+
+    ensure_internal_connection_error (self, NULL);
+    return self->priv->connection_error;
+}
+
+/*****************************************************************************/
+
 /**
  * mm_bearer_connect_finish:
  * @self: A #MMBearer.
@@ -932,6 +1048,7 @@ mm_bearer_init (MMBearer *self)
     g_mutex_init (&self->priv->ipv6_config_mutex);
     g_mutex_init (&self->priv->properties_mutex);
     g_mutex_init (&self->priv->stats_mutex);
+    g_mutex_init (&self->priv->connection_error_mutex);
 }
 
 static void
@@ -943,6 +1060,7 @@ finalize (GObject *object)
     g_mutex_clear (&self->priv->ipv6_config_mutex);
     g_mutex_clear (&self->priv->properties_mutex);
     g_mutex_clear (&self->priv->stats_mutex);
+    g_mutex_clear (&self->priv->connection_error_mutex);
 
     G_OBJECT_CLASS (mm_bearer_parent_class)->finalize (object);
 }
@@ -956,6 +1074,7 @@ dispose (GObject *object)
     g_clear_object (&self->priv->ipv6_config);
     g_clear_object (&self->priv->properties);
     g_clear_object (&self->priv->stats);
+    g_clear_error (&self->priv->connection_error);
 
     G_OBJECT_CLASS (mm_bearer_parent_class)->dispose (object);
 }
diff --git a/libmm-glib/mm-bearer.h b/libmm-glib/mm-bearer.h
index 9f15e926..2240d7a2 100644
--- a/libmm-glib/mm-bearer.h
+++ b/libmm-glib/mm-bearer.h
@@ -120,6 +120,9 @@ MMBearerIpConfig   *mm_bearer_peek_ipv6_config (MMBearer *self);
 MMBearerStats      *mm_bearer_get_stats        (MMBearer *self);
 MMBearerStats      *mm_bearer_peek_stats       (MMBearer *self);
 
+GError             *mm_bearer_get_connection_error  (MMBearer *self);
+GError             *mm_bearer_peek_connection_error (MMBearer *self);
+
 G_END_DECLS
 
 #endif /* _MM_BEARER_H_ */
diff --git a/libmm-glib/mm-common-helpers.c b/libmm-glib/mm-common-helpers.c
index 50c4c830..fdd72a3b 100644
--- a/libmm-glib/mm-common-helpers.c
+++ b/libmm-glib/mm-common-helpers.c
@@ -1911,3 +1911,53 @@ mm_common_register_errors (void)
 
     return TRUE;
 }
+
+GError *
+mm_common_error_from_tuple (GVariant  *tuple,
+                            GError   **error)
+{
+    g_autoptr(GError)  dbus_error = NULL;
+    g_autofree gchar  *error_name = NULL;
+    g_autofree gchar  *error_message = NULL;
+
+    mm_common_register_errors ();
+
+    if (!g_variant_is_of_type (tuple, G_VARIANT_TYPE ("(ss)"))) {
+        g_set_error (error,
+                     MM_CORE_ERROR,
+                     MM_CORE_ERROR_INVALID_ARGS,
+                     "Cannot create error from tuple: "
+                     "invalid variant type received");
+        return NULL;
+    }
+
+    g_variant_get (tuple, "(ss)", &error_name, &error_message);
+    if (!error_name || !error_name[0])
+        return NULL;
+
+    /* We convert the error name into a proper GError (domain+code), but we
+     * don't attempt to give the error message to new_for_dbus_error() as that
+     * would generate a string we don't want (e.g. instead of just "Unknown
+     * Error" we would get "GDBus.Error:org.freedesktop.ModemManager1.Error.MobileEquipment.Unknown: Unknown error"
+     */
+    dbus_error = g_dbus_error_new_for_dbus_error (error_name, "");
+
+    /* And now we build a new GError with same domain+code but with the received
+     * error message */
+    return g_error_new (dbus_error->domain, dbus_error->code, "%s", error_message);
+}
+
+GVariant *
+mm_common_error_to_tuple (const GError *error)
+{
+    g_autofree gchar *error_name = NULL;
+    GVariant         *tuple[2];
+
+    mm_common_register_errors ();
+
+    error_name = g_dbus_error_encode_gerror (error);
+    tuple[0] = g_variant_new_string (error_name);
+    tuple[1] = g_variant_new_string (error->message);
+
+    return g_variant_ref_sink (g_variant_new_tuple (tuple, 2));
+}
diff --git a/libmm-glib/mm-common-helpers.h b/libmm-glib/mm-common-helpers.h
index a0037cd0..1e778b30 100644
--- a/libmm-glib/mm-common-helpers.h
+++ b/libmm-glib/mm-common-helpers.h
@@ -202,6 +202,9 @@ gboolean  mm_utils_ishexstr   (const gchar *hex);
 gboolean  mm_utils_check_for_single_value (guint32 value);
 
 /* DBus error handling */
-gboolean mm_common_register_errors (void);
+gboolean  mm_common_register_errors  (void);
+GError   *mm_common_error_from_tuple (GVariant      *tuple,
+                                      GError       **error);
+GVariant *mm_common_error_to_tuple   (const GError  *error);
 
 #endif /* MM_COMMON_HELPERS_H */