From 701d663523418c88c76b525d6e4f8f55146abac1 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Tue, 28 May 2019 15:57:43 +0200
Subject: [PATCH 1/8] devices/modem-broadband: disconnect signals on dispose

---
 src/devices/wwan/nm-modem-broadband.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index ae9293b0f0..7ddac6c640 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -1448,7 +1448,12 @@ dispose (GObject *object)
 	g_clear_object (&self->_priv.ipv4_config);
 	g_clear_object (&self->_priv.ipv6_config);
 	g_clear_object (&self->_priv.bearer);
-	g_clear_object (&self->_priv.modem_iface);
+
+	if (self->_priv.modem_iface) {
+		g_signal_handlers_disconnect_by_data (self->_priv.modem_iface, self);
+		g_clear_object (&self->_priv.modem_iface);
+	}
+
 	g_clear_object (&self->_priv.simple_iface);
 	g_clear_object (&self->_priv.sim_iface);
 	g_clear_object (&self->_priv.modem_object);

From 84539ce4cc9f466862314093de2f2ed9d0438921 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 6 May 2019 14:29:04 +0200
Subject: [PATCH 2/8] introspection/modem: (trivial) move a signal below
 properties

---
 ...reedesktop.NetworkManager.Device.Modem.xml | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
index d3cbd55768..330d693119 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
@@ -6,17 +6,6 @@
 
   -->
   <interface name="org.freedesktop.NetworkManager.Device.Modem">
-
-    <!--
-        PropertiesChanged:
-        @properties: A dictionary mapping property names to variant boxed values
-
-        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
-    -->
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}"/>
-    </signal>
-
     <!--
         ModemCapabilities:
 
@@ -38,5 +27,16 @@
         Returns: <link linkend="NMDeviceModemCapabilities">NMDeviceModemCapabilities</link>
     -->
     <property name="CurrentCapabilities" type="u" access="read"/>
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+
+        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
+    -->
+    <signal name="PropertiesChanged">
+        <arg name="properties" type="a{sv}"/>
+    </signal>
+
   </interface>
 </node>

From 03a91270b87d80e187dddfea17e50a04638169b5 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 6 May 2019 17:12:08 +0200
Subject: [PATCH 3/8] wwan: expose device id on the bus

The device id is useful to pinpoint the connection to a particular
device. However, we don't expose it anywhere and it's sort of hard to
guess.
---
 ...reedesktop.NetworkManager.Device.Modem.xml | 11 ++++++++++
 src/devices/wwan/libnm-wwan.ver               |  1 +
 src/devices/wwan/nm-device-modem.c            | 21 ++++++++++++++++++-
 src/devices/wwan/nm-device-modem.h            |  1 +
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
index 330d693119..9ef4c7105d 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
@@ -28,6 +28,17 @@
     -->
     <property name="CurrentCapabilities" type="u" access="read"/>
 
+    <!--
+        DeviceId:
+
+        An identifier used by the modem backend (ModemManager) that aims to
+        uniquely identify the a device. Can be used to match a connection to a
+        particular device.
+
+        Since: 1.20
+    -->
+    <property name="DeviceId" type="s" access="read" />
+
     <!--
         PropertiesChanged:
         @properties: A dictionary mapping property names to variant boxed values
diff --git a/src/devices/wwan/libnm-wwan.ver b/src/devices/wwan/libnm-wwan.ver
index ea966afe6a..eb3bbb792b 100644
--- a/src/devices/wwan/libnm-wwan.ver
+++ b/src/devices/wwan/libnm-wwan.ver
@@ -10,6 +10,7 @@ global:
 	nm_modem_get_capabilities;
 	nm_modem_get_configured_mtu;
 	nm_modem_get_control_port;
+	nm_modem_get_device_id;
 	nm_modem_get_driver;
 	nm_modem_get_iid;
 	nm_modem_get_path;
diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
index ec7cabea9b..df7d1446d7 100644
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/devices/wwan/nm-device-modem.c
@@ -15,7 +15,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Copyright (C) 2009 - 2011 Red Hat, Inc.
+ * Copyright (C) 2009 - 2019 Red Hat, Inc.
  */
 
 #include "nm-default.h"
@@ -40,6 +40,7 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE (
 	PROP_MODEM,
 	PROP_CAPABILITIES,
 	PROP_CURRENT_CAPABILITIES,
+	PROP_DEVICE_ID,
 );
 
 typedef struct {
@@ -47,6 +48,7 @@ typedef struct {
 	NMDeviceModemCapabilities caps;
 	NMDeviceModemCapabilities current_caps;
 	gboolean rf_enabled;
+	char *device_id;
 } NMDeviceModemPrivate;
 
 struct _NMDeviceModem {
@@ -722,6 +724,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_CURRENT_CAPABILITIES:
 		g_value_set_uint (value, priv->current_caps);
 		break;
+	case PROP_DEVICE_ID:
+		g_value_set_string (value, priv->device_id);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -745,6 +750,10 @@ set_property (GObject *object, guint prop_id,
 	case PROP_CURRENT_CAPABILITIES:
 		priv->current_caps = g_value_get_uint (value);
 		break;
+	case PROP_DEVICE_ID:
+		/* construct-only */
+		priv->device_id = g_value_dup_string (value);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -779,6 +788,7 @@ nm_device_modem_new (NMModem *modem)
 	                     NM_DEVICE_MODEM_MODEM, modem,
 	                     NM_DEVICE_MODEM_CAPABILITIES, caps,
 	                     NM_DEVICE_MODEM_CURRENT_CAPABILITIES, current_caps,
+	                     NM_DEVICE_MODEM_DEVICE_ID, nm_modem_get_device_id (modem),
 	                     NULL);
 }
 
@@ -792,6 +802,8 @@ dispose (GObject *object)
 		g_clear_object (&priv->modem);
 	}
 
+	g_clear_pointer (&priv->device_id, g_free);
+
 	G_OBJECT_CLASS (nm_device_modem_parent_class)->dispose (object);
 }
 
@@ -804,6 +816,7 @@ static const NMDBusInterfaceInfoExtended interface_info_device_modem = {
 		.properties = NM_DEFINE_GDBUS_PROPERTY_INFOS (
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("ModemCapabilities",   "u",  NM_DEVICE_MODEM_CAPABILITIES),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("CurrentCapabilities", "u",  NM_DEVICE_MODEM_CURRENT_CAPABILITIES),
+			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE   ("DeviceId",            "s",  NM_DEVICE_MODEM_DEVICE_ID),
 		),
 	),
 	.legacy_property_changed = TRUE,
@@ -861,5 +874,11 @@ nm_device_modem_class_init (NMDeviceModemClass *klass)
 	                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
 	                        G_PARAM_STATIC_STRINGS);
 
+	obj_properties[PROP_DEVICE_ID] =
+	     g_param_spec_string (NM_DEVICE_MODEM_DEVICE_ID, "", "",
+	                          NULL,
+	                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+	                          G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 }
diff --git a/src/devices/wwan/nm-device-modem.h b/src/devices/wwan/nm-device-modem.h
index 65bda8b6ef..4e299c8f25 100644
--- a/src/devices/wwan/nm-device-modem.h
+++ b/src/devices/wwan/nm-device-modem.h
@@ -34,6 +34,7 @@
 #define NM_DEVICE_MODEM_MODEM "modem"
 #define NM_DEVICE_MODEM_CAPABILITIES "modem-capabilities"
 #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
+#define NM_DEVICE_MODEM_DEVICE_ID            "device-id"
 
 typedef struct _NMDeviceModem NMDeviceModem;
 typedef struct _NMDeviceModemClass NMDeviceModemClass;

From f18b09b3f6957c798bb826df159a5f6b591bacf6 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 6 May 2019 17:45:30 +0200
Subject: [PATCH 4/8] libnm/modem: add device id getter

---
 libnm/libnm.ver         |  5 +++++
 libnm/nm-device-modem.c | 50 +++++++++++++++++++++++++++++++++++++++++
 libnm/nm-device-modem.h |  4 ++++
 3 files changed, 59 insertions(+)

diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 8100f3b631..2209452a6a 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1604,3 +1604,8 @@ global:
 	nm_tc_qdisc_get_attribute_names;
 	nm_tc_qdisc_set_attribute;
 } libnm_1_16_0;
+
+libnm_1_20_0 {
+global:
+	nm_device_modem_get_device_id;
+} libnm_1_18_0;
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index 0373b3c08a..8fd54b8ca4 100644
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -36,12 +36,14 @@ G_DEFINE_TYPE (NMDeviceModem, nm_device_modem, NM_TYPE_DEVICE)
 typedef struct {
 	NMDeviceModemCapabilities caps;
 	NMDeviceModemCapabilities current_caps;
+	char *device_id;
 } NMDeviceModemPrivate;
 
 enum {
 	PROP_0,
 	PROP_MODEM_CAPS,
 	PROP_CURRENT_CAPS,
+	PROP_DEVICE_ID,
 	LAST_PROP
 };
 
@@ -82,6 +84,26 @@ nm_device_modem_get_current_capabilities (NMDeviceModem *self)
 	return NM_DEVICE_MODEM_GET_PRIVATE (self)->current_caps;
 }
 
+/**
+ * nm_device_modem_get_device_id:
+ * @self: a #NMDeviceModem
+ *
+ * An identifier used by the modem backend (ModemManager) that aims to
+ * uniquely identify the a device. Can be used to match a connection to a
+ * particular device.
+ *
+ * Returns: a device-id string
+ *
+ * Since: 1.20
+ **/
+const char *
+nm_device_modem_get_device_id (NMDeviceModem *self)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_MODEM (self), NULL);
+
+	return NM_DEVICE_MODEM_GET_PRIVATE (self)->device_id;
+}
+
 static const char *
 get_type_description (NMDevice *device)
 {
@@ -164,6 +186,7 @@ init_dbus (NMObject *object)
 	const NMPropertiesInfo property_info[] = {
 		{ NM_DEVICE_MODEM_MODEM_CAPABILITIES,   &priv->caps },
 		{ NM_DEVICE_MODEM_CURRENT_CAPABILITIES, &priv->current_caps },
+		{ NM_DEVICE_MODEM_DEVICE_ID,            &priv->device_id },
 		{ NULL },
 	};
 
@@ -174,6 +197,16 @@ init_dbus (NMObject *object)
 	                                property_info);
 }
 
+static void
+finalize (GObject *object)
+{
+	NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (object);
+
+	g_free (priv->device_id);
+
+	G_OBJECT_CLASS (nm_device_modem_parent_class)->finalize (object);
+}
+
 static void
 get_property (GObject *object,
               guint prop_id,
@@ -189,6 +222,9 @@ get_property (GObject *object,
 	case PROP_CURRENT_CAPS:
 		g_value_set_flags (value, nm_device_modem_get_current_capabilities (self));
 		break;
+	case PROP_DEVICE_ID:
+		g_value_set_string (value, nm_device_modem_get_device_id (self));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -205,6 +241,7 @@ nm_device_modem_class_init (NMDeviceModemClass *modem_class)
 	g_type_class_add_private (modem_class, sizeof (NMDeviceModemPrivate));
 
 	/* virtual methods */
+	object_class->finalize = finalize;
 	object_class->get_property = get_property;
 
 	nm_object_class->init_dbus = init_dbus;
@@ -242,4 +279,17 @@ nm_device_modem_class_init (NMDeviceModemClass *modem_class)
 		                     NM_DEVICE_MODEM_CAPABILITY_NONE,
 		                     G_PARAM_READABLE |
 		                     G_PARAM_STATIC_STRINGS));
+
+	/**
+	 * NMDeviceModem:device-id:
+	 *
+	 * Since: 1.20
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_CURRENT_CAPS,
+		 g_param_spec_string (NM_DEVICE_MODEM_DEVICE_ID, "", "",
+		                     NULL,
+		                     G_PARAM_READABLE |
+		                     G_PARAM_STATIC_STRINGS));
+
 }
diff --git a/libnm/nm-device-modem.h b/libnm/nm-device-modem.h
index a5af03460d..588851fd71 100644
--- a/libnm/nm-device-modem.h
+++ b/libnm/nm-device-modem.h
@@ -39,6 +39,7 @@ G_BEGIN_DECLS
 
 #define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
 #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
+#define NM_DEVICE_MODEM_DEVICE_ID            "device-id"
 
 /**
  * NMDeviceModem:
@@ -59,6 +60,9 @@ GType nm_device_modem_get_type (void);
 NMDeviceModemCapabilities nm_device_modem_get_modem_capabilities (NMDeviceModem *self);
 NMDeviceModemCapabilities nm_device_modem_get_current_capabilities (NMDeviceModem *self);
 
+NM_AVAILABLE_IN_1_20
+const char *nm_device_modem_get_device_id (NMDeviceModem *self);
+
 G_END_DECLS
 
 #endif /* __NM_DEVICE_MODEM_H__ */

From bba4a37a59d36ea68e16854c3cecc1c7f8b8fa68 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 6 May 2019 17:15:31 +0200
Subject: [PATCH 5/8] wwan: expose the network id on the D-Bus

This is going to be useful for UIs to find out which network is the
device actually registered with.
---
 ...reedesktop.NetworkManager.Device.Modem.xml | 10 ++++++
 src/devices/wwan/libnm-wwan.ver               |  1 +
 src/devices/wwan/nm-device-modem.c            | 29 ++++++++++++++++-
 src/devices/wwan/nm-device-modem.h            |  1 +
 src/devices/wwan/nm-modem-broadband.c         | 30 +++++++++++++++++
 src/devices/wwan/nm-modem.c                   | 32 +++++++++++++++++++
 src/devices/wwan/nm-modem.h                   |  4 +++
 7 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
index 9ef4c7105d..425e8df004 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
@@ -39,6 +39,16 @@
     -->
     <property name="DeviceId" type="s" access="read" />
 
+    <!--
+        OperatorCode:
+
+        The MCC and MNC (concatenated) of the network the modem is connected to.
+        Blank if disconnected or not a 3GPP modem.
+
+        Since: 1.20
+    -->
+    <property name="OperatorCode" type="s" access="read" />
+
     <!--
         PropertiesChanged:
         @properties: A dictionary mapping property names to variant boxed values
diff --git a/src/devices/wwan/libnm-wwan.ver b/src/devices/wwan/libnm-wwan.ver
index eb3bbb792b..b4b1e31a9e 100644
--- a/src/devices/wwan/libnm-wwan.ver
+++ b/src/devices/wwan/libnm-wwan.ver
@@ -15,6 +15,7 @@ global:
 	nm_modem_get_iid;
 	nm_modem_get_path;
 	nm_modem_get_ip_ifindex;
+	nm_modem_get_operator_code;
 	nm_modem_get_secrets;
 	nm_modem_get_state;
 	nm_modem_get_type;
diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
index df7d1446d7..ad118b60c1 100644
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/devices/wwan/nm-device-modem.c
@@ -36,11 +36,12 @@ _LOG_DECLARE_SELF(NMDeviceModem);
 
 /*****************************************************************************/
 
-NM_GOBJECT_PROPERTIES_DEFINE_BASE (
+NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceModem,
 	PROP_MODEM,
 	PROP_CAPABILITIES,
 	PROP_CURRENT_CAPABILITIES,
 	PROP_DEVICE_ID,
+	PROP_OPERATOR_CODE,
 );
 
 typedef struct {
@@ -49,6 +50,7 @@ typedef struct {
 	NMDeviceModemCapabilities current_caps;
 	gboolean rf_enabled;
 	char *device_id;
+	char *operator_code;
 } NMDeviceModemPrivate;
 
 struct _NMDeviceModem {
@@ -309,6 +311,20 @@ ip_ifindex_changed_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data)
 	nm_device_sysctl_ip_conf_set (device, AF_INET6, "disable_ipv6", "1");
 }
 
+static void
+operator_code_changed_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data)
+{
+	NMDeviceModem *self = NM_DEVICE_MODEM (user_data);
+	NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (self);
+	const char *operator_code = nm_modem_get_operator_code (modem);
+
+	if (g_strcmp0 (priv->operator_code, operator_code) != 0) {
+		g_free (priv->operator_code);
+		priv->operator_code = g_strdup (operator_code);
+		_notify (self, PROP_OPERATOR_CODE);
+	}
+}
+
 static void
 ids_changed_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data)
 {
@@ -694,6 +710,7 @@ set_modem (NMDeviceModem *self, NMModem *modem)
 	g_signal_connect (modem, "notify::" NM_MODEM_DEVICE_ID, G_CALLBACK (ids_changed_cb), self);
 	g_signal_connect (modem, "notify::" NM_MODEM_SIM_ID, G_CALLBACK (ids_changed_cb), self);
 	g_signal_connect (modem, "notify::" NM_MODEM_SIM_OPERATOR_ID, G_CALLBACK (ids_changed_cb), self);
+	g_signal_connect (modem, "notify::" NM_MODEM_OPERATOR_CODE, G_CALLBACK (operator_code_changed_cb), self);
 }
 
 static guint32
@@ -727,6 +744,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_DEVICE_ID:
 		g_value_set_string (value, priv->device_id);
 		break;
+	case PROP_OPERATOR_CODE:
+		g_value_set_string (value, priv->operator_code);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -803,6 +823,7 @@ dispose (GObject *object)
 	}
 
 	g_clear_pointer (&priv->device_id, g_free);
+	g_clear_pointer (&priv->operator_code, g_free);
 
 	G_OBJECT_CLASS (nm_device_modem_parent_class)->dispose (object);
 }
@@ -817,6 +838,7 @@ static const NMDBusInterfaceInfoExtended interface_info_device_modem = {
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("ModemCapabilities",   "u",  NM_DEVICE_MODEM_CAPABILITIES),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("CurrentCapabilities", "u",  NM_DEVICE_MODEM_CURRENT_CAPABILITIES),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE   ("DeviceId",            "s",  NM_DEVICE_MODEM_DEVICE_ID),
+			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE   ("OperatorCode",        "s",  NM_DEVICE_MODEM_OPERATOR_CODE),
 		),
 	),
 	.legacy_property_changed = TRUE,
@@ -880,5 +902,10 @@ nm_device_modem_class_init (NMDeviceModemClass *klass)
 	                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
 	                          G_PARAM_STATIC_STRINGS);
 
+	obj_properties[PROP_OPERATOR_CODE] =
+	     g_param_spec_string (NM_DEVICE_MODEM_OPERATOR_CODE, "", "",
+	                          NULL,
+	                          G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 }
diff --git a/src/devices/wwan/nm-device-modem.h b/src/devices/wwan/nm-device-modem.h
index 4e299c8f25..2cfc676573 100644
--- a/src/devices/wwan/nm-device-modem.h
+++ b/src/devices/wwan/nm-device-modem.h
@@ -35,6 +35,7 @@
 #define NM_DEVICE_MODEM_CAPABILITIES "modem-capabilities"
 #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 #define NM_DEVICE_MODEM_DEVICE_ID            "device-id"
+#define NM_DEVICE_MODEM_OPERATOR_CODE        "operator-code"
 
 typedef struct _NMDeviceModem NMDeviceModem;
 typedef struct _NMDeviceModemClass NMDeviceModemClass;
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index 7ddac6c640..731c733866 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -79,6 +79,7 @@ typedef struct {
 	MMObject *modem_object;
 	/* Per-interface objects */
 	MMModem *modem_iface;
+	MMModem3gpp *modem_3gpp_iface;
 	MMModemSimple *simple_iface;
 	MMSim *sim_iface;
 
@@ -1338,6 +1339,15 @@ supported_ip_families_changed (MMModem *modem, GParamSpec *pspec, gpointer user_
 	              NULL);
 }
 
+static void
+operator_code_changed (MMModem3gpp *modem_3gpp, GParamSpec *pspec, gpointer user_data)
+{
+	NMModemBroadband *self = NM_MODEM_BROADBAND (user_data);
+
+	g_return_if_fail (modem_3gpp == self->_priv.modem_3gpp_iface);
+	_nm_modem_set_operator_code (NM_MODEM (self), mm_modem_3gpp_get_operator_code (modem_3gpp));
+}
+
 /*****************************************************************************/
 
 static void
@@ -1371,6 +1381,7 @@ set_property (GObject *object,
 		/* construct-only */
 		self->_priv.modem_object = g_value_dup_object (value);
 		self->_priv.modem_iface = mm_object_get_modem (self->_priv.modem_object);
+		self->_priv.modem_3gpp_iface = mm_object_get_modem_3gpp (self->_priv.modem_object);
 		g_assert (self->_priv.modem_iface != NULL);
 		g_signal_connect (self->_priv.modem_iface,
 		                  "state-changed",
@@ -1386,6 +1397,13 @@ set_property (GObject *object,
 		                  G_CALLBACK (supported_ip_families_changed),
 		                  self);
 
+		if (self->_priv.modem_3gpp_iface) {
+			g_signal_connect (self->_priv.modem_3gpp_iface,
+			                  "notify::operator-code",
+			                  G_CALLBACK (operator_code_changed),
+			                  self);
+		}
+
 		/* Note: don't grab the Simple iface here; the Modem interface is the
 		 * only one assumed to be always valid and available */
 		break;
@@ -1407,7 +1425,9 @@ nm_modem_broadband_new (GObject *object, GError **error)
 {
 	MMObject *modem_object;
 	MMModem *modem_iface;
+	MMModem3gpp *modem_3gpp_iface;
 	const char *const*drivers;
+	const char *operator_code = NULL;
 	gs_free char *driver = NULL;
 
 	g_return_val_if_fail (MM_IS_OBJECT (object), NULL);
@@ -1423,6 +1443,10 @@ nm_modem_broadband_new (GObject *object, GError **error)
 	if (drivers)
 		driver = g_strjoinv (", ", (char **) drivers);
 
+	modem_3gpp_iface = mm_object_peek_modem_3gpp (modem_object);
+	if (modem_3gpp_iface)
+		operator_code = mm_modem_3gpp_get_operator_code (modem_3gpp_iface);
+
 	return g_object_new (NM_TYPE_MODEM_BROADBAND,
 	                     NM_MODEM_PATH, mm_object_get_path (modem_object),
 	                     NM_MODEM_UID, mm_modem_get_primary_port (modem_iface),
@@ -1432,6 +1456,7 @@ nm_modem_broadband_new (GObject *object, GError **error)
 	                     NM_MODEM_DEVICE_ID, mm_modem_get_device_identifier (modem_iface),
 	                     NM_MODEM_BROADBAND_MODEM, modem_object,
 	                     NM_MODEM_DRIVER, driver,
+	                     NM_MODEM_OPERATOR_CODE, operator_code,
 	                     NULL);
 }
 
@@ -1454,6 +1479,11 @@ dispose (GObject *object)
 		g_clear_object (&self->_priv.modem_iface);
 	}
 
+	if (self->_priv.modem_3gpp_iface) {
+		g_signal_handlers_disconnect_by_data (self->_priv.modem_3gpp_iface, self);
+		g_clear_object (&self->_priv.modem_3gpp_iface);
+	}
+
 	g_clear_object (&self->_priv.simple_iface);
 	g_clear_object (&self->_priv.sim_iface);
 	g_clear_object (&self->_priv.modem_object);
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index ca45e95ab2..e6017a63f9 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -52,6 +52,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMModem,
 	PROP_SIM_ID,
 	PROP_IP_TYPES,
 	PROP_SIM_OPERATOR_ID,
+	PROP_OPERATOR_CODE,
 );
 
 enum {
@@ -90,6 +91,7 @@ typedef struct _NMModemPrivate {
 	char *sim_id;
 	NMModemIPType ip_types;
 	char *sim_operator_id;
+	char *operator_code;
 
 	NMPPPManager *ppp_manager;
 
@@ -436,6 +438,12 @@ nm_modem_get_sim_operator_id (NMModem *self)
 	return NM_MODEM_GET_PRIVATE (self)->sim_operator_id;
 }
 
+const char *
+nm_modem_get_operator_code (NMModem *self)
+{
+	return NM_MODEM_GET_PRIVATE (self)->operator_code;
+}
+
 /*****************************************************************************/
 /* IP method PPP */
 
@@ -1577,6 +1585,18 @@ nm_modem_get_capabilities (NMModem *self,
 
 /*****************************************************************************/
 
+void
+_nm_modem_set_operator_code (NMModem *self, const char *operator_code)
+{
+	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self);
+
+	if (g_strcmp0 (priv->operator_code, operator_code) != 0) {
+		g_free (priv->operator_code);
+		priv->operator_code = g_strdup (operator_code);
+		_notify (self, PROP_OPERATOR_CODE);
+	}
+}
+
 static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
@@ -1615,6 +1635,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_SIM_OPERATOR_ID:
 		g_value_set_string (value, priv->sim_operator_id);
 		break;
+	case PROP_OPERATOR_CODE:
+		g_value_set_string (value, priv->operator_code);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -1667,6 +1690,9 @@ set_property (GObject *object, guint prop_id,
 		if (s && s[0])
 			priv->sim_operator_id = g_strdup (s);
 		break;
+	case PROP_OPERATOR_CODE:
+		_nm_modem_set_operator_code (NM_MODEM (object), g_value_get_string (value));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -1728,6 +1754,7 @@ finalize (GObject *object)
 	g_free (priv->device_id);
 	g_free (priv->sim_id);
 	g_free (priv->sim_operator_id);
+	g_free (priv->operator_code);
 
 	G_OBJECT_CLASS (nm_modem_parent_class)->finalize (object);
 }
@@ -1811,6 +1838,11 @@ nm_modem_class_init (NMModemClass *klass)
 	                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
 	                          G_PARAM_STATIC_STRINGS);
 
+	obj_properties[PROP_OPERATOR_CODE] =
+	     g_param_spec_string (NM_MODEM_OPERATOR_CODE, "", "",
+	                          NULL,
+	                          G_PARAM_STATIC_STRINGS);
+
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
 	signals[PPP_STATS] =
diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h
index 6adc768aa5..f32fedf53a 100644
--- a/src/devices/wwan/nm-modem.h
+++ b/src/devices/wwan/nm-modem.h
@@ -43,6 +43,7 @@
 #define NM_MODEM_SIM_ID          "sim-id"
 #define NM_MODEM_IP_TYPES        "ip-types"   /* Supported IP types */
 #define NM_MODEM_SIM_OPERATOR_ID "sim-operator-id"
+#define NM_MODEM_OPERATOR_CODE   "operator-code"
 
 /* Signals */
 #define NM_MODEM_PPP_STATS         "ppp-stats"
@@ -175,6 +176,7 @@ const char *nm_modem_get_device_id       (NMModem *modem);
 const char *nm_modem_get_sim_id          (NMModem *modem);
 const char *nm_modem_get_sim_operator_id (NMModem *modem);
 gboolean    nm_modem_get_iid             (NMModem *modem, NMUtilsIPv6IfaceId *out_iid);
+const char *nm_modem_get_operator_code   (NMModem *modem);
 
 gboolean    nm_modem_set_data_port (NMModem *self,
                                     NMPlatform *platform,
@@ -286,4 +288,6 @@ const char *nm_modem_ip_type_to_string (NMModemIPType ip_type);
 
 guint32 nm_modem_get_configured_mtu (NMDevice *self, NMDeviceMtuSource *out_source);
 
+void _nm_modem_set_operator_code (NMModem *self, const char *operator_code);
+
 #endif /* __NETWORKMANAGER_MODEM_H__ */

From 0b3dd18c2bb431755803259f09d0d4788fdf5c3f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 6 May 2019 17:46:31 +0200
Subject: [PATCH 6/8] libnm/modem: add network id getter

---
 libnm/libnm.ver         |  1 +
 libnm/nm-device-modem.c | 37 +++++++++++++++++++++++++++++++++++++
 libnm/nm-device-modem.h |  4 ++++
 3 files changed, 42 insertions(+)

diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 2209452a6a..526ec0529d 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1608,4 +1608,5 @@ global:
 libnm_1_20_0 {
 global:
 	nm_device_modem_get_device_id;
+	nm_device_modem_get_operator_code;
 } libnm_1_18_0;
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index 8fd54b8ca4..4565d80228 100644
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -37,6 +37,7 @@ typedef struct {
 	NMDeviceModemCapabilities caps;
 	NMDeviceModemCapabilities current_caps;
 	char *device_id;
+	char *operator_code;
 } NMDeviceModemPrivate;
 
 enum {
@@ -44,6 +45,7 @@ enum {
 	PROP_MODEM_CAPS,
 	PROP_CURRENT_CAPS,
 	PROP_DEVICE_ID,
+	PROP_OPERATOR_CODE,
 	LAST_PROP
 };
 
@@ -104,6 +106,24 @@ nm_device_modem_get_device_id (NMDeviceModem *self)
 	return NM_DEVICE_MODEM_GET_PRIVATE (self)->device_id;
 }
 
+/**
+ * nm_device_modem_get_operator_code:
+ * @self: a #NMDeviceModem
+ *
+ * The MCC and MNC (concatenated) of the network the modem is connected to.
+ *
+ * Returns: the operator code or %NULL if disconnected or not a 3GPP modem.
+ *
+ * Since: 1.20
+ **/
+const char *
+nm_device_modem_get_operator_code (NMDeviceModem *self)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_MODEM (self), NULL);
+
+	return NM_DEVICE_MODEM_GET_PRIVATE (self)->operator_code;
+}
+
 static const char *
 get_type_description (NMDevice *device)
 {
@@ -187,6 +207,7 @@ init_dbus (NMObject *object)
 		{ NM_DEVICE_MODEM_MODEM_CAPABILITIES,   &priv->caps },
 		{ NM_DEVICE_MODEM_CURRENT_CAPABILITIES, &priv->current_caps },
 		{ NM_DEVICE_MODEM_DEVICE_ID,            &priv->device_id },
+		{ NM_DEVICE_MODEM_OPERATOR_CODE,        &priv->operator_code },
 		{ NULL },
 	};
 
@@ -203,6 +224,7 @@ finalize (GObject *object)
 	NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (object);
 
 	g_free (priv->device_id);
+	g_free (priv->operator_code);
 
 	G_OBJECT_CLASS (nm_device_modem_parent_class)->finalize (object);
 }
@@ -225,6 +247,9 @@ get_property (GObject *object,
 	case PROP_DEVICE_ID:
 		g_value_set_string (value, nm_device_modem_get_device_id (self));
 		break;
+	case PROP_OPERATOR_CODE:
+		g_value_set_string (value, nm_device_modem_get_operator_code (self));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -292,4 +317,16 @@ nm_device_modem_class_init (NMDeviceModemClass *modem_class)
 		                     G_PARAM_READABLE |
 		                     G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * NMDeviceModem:operator-code:
+	 *
+	 * Since: 1.20
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_CURRENT_CAPS,
+		 g_param_spec_string (NM_DEVICE_MODEM_OPERATOR_CODE, "", "",
+		                     NULL,
+		                     G_PARAM_READABLE |
+		                     G_PARAM_STATIC_STRINGS));
+
 }
diff --git a/libnm/nm-device-modem.h b/libnm/nm-device-modem.h
index 588851fd71..c0f9886906 100644
--- a/libnm/nm-device-modem.h
+++ b/libnm/nm-device-modem.h
@@ -40,6 +40,7 @@ G_BEGIN_DECLS
 #define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
 #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 #define NM_DEVICE_MODEM_DEVICE_ID            "device-id"
+#define NM_DEVICE_MODEM_OPERATOR_CODE        "operator-code"
 
 /**
  * NMDeviceModem:
@@ -63,6 +64,9 @@ NMDeviceModemCapabilities nm_device_modem_get_current_capabilities (NMDeviceMode
 NM_AVAILABLE_IN_1_20
 const char *nm_device_modem_get_device_id (NMDeviceModem *self);
 
+NM_AVAILABLE_IN_1_20
+const char *nm_device_modem_get_operator_code (NMDeviceModem *self);
+
 G_END_DECLS
 
 #endif /* __NM_DEVICE_MODEM_H__ */

From b5b8b23c4bae269541e3388135a21462105beaf2 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 6 May 2019 17:19:51 +0200
Subject: [PATCH 7/8] wwan: expose the APN on the D-Bus

This is going to be useful for UIs to know which plan we're actually
using.
---
 ...reedesktop.NetworkManager.Device.Modem.xml |  9 +++++
 src/devices/wwan/libnm-wwan.ver               |  1 +
 src/devices/wwan/nm-device-modem.c            | 29 ++++++++++++++++
 src/devices/wwan/nm-device-modem.h            |  1 +
 src/devices/wwan/nm-modem-broadband.c         |  3 ++
 src/devices/wwan/nm-modem.c                   | 34 +++++++++++++++++++
 src/devices/wwan/nm-modem.h                   |  3 ++
 7 files changed, 80 insertions(+)

diff --git a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
index 425e8df004..fabe1a2ee0 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
@@ -49,6 +49,15 @@
     -->
     <property name="OperatorCode" type="s" access="read" />
 
+    <!--
+        Apn:
+
+        The access point name the modem is connected to. Blank if disconnected.
+
+        Since: 1.20
+    -->
+    <property name="Apn" type="s" access="read" />
+
     <!--
         PropertiesChanged:
         @properties: A dictionary mapping property names to variant boxed values
diff --git a/src/devices/wwan/libnm-wwan.ver b/src/devices/wwan/libnm-wwan.ver
index b4b1e31a9e..7ccebcb5ee 100644
--- a/src/devices/wwan/libnm-wwan.ver
+++ b/src/devices/wwan/libnm-wwan.ver
@@ -7,6 +7,7 @@ global:
 	nm_modem_deactivate;
 	nm_modem_deactivate_async;
 	nm_modem_device_state_changed;
+	nm_modem_get_apn;
 	nm_modem_get_capabilities;
 	nm_modem_get_configured_mtu;
 	nm_modem_get_control_port;
diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
index ad118b60c1..2a4a124793 100644
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/devices/wwan/nm-device-modem.c
@@ -42,6 +42,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceModem,
 	PROP_CURRENT_CAPABILITIES,
 	PROP_DEVICE_ID,
 	PROP_OPERATOR_CODE,
+	PROP_APN,
 );
 
 typedef struct {
@@ -51,6 +52,7 @@ typedef struct {
 	gboolean rf_enabled;
 	char *device_id;
 	char *operator_code;
+	char *apn;
 } NMDeviceModemPrivate;
 
 struct _NMDeviceModem {
@@ -325,6 +327,20 @@ operator_code_changed_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data)
 	}
 }
 
+static void
+apn_changed_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data)
+{
+	NMDeviceModem *self = NM_DEVICE_MODEM (user_data);
+	NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (self);
+	const char *apn = nm_modem_get_apn (modem);
+
+	if (g_strcmp0 (priv->apn, apn) != 0) {
+		g_free (priv->apn);
+		priv->apn = g_strdup (apn);
+		_notify (self, PROP_APN);
+	}
+}
+
 static void
 ids_changed_cb (NMModem *modem, GParamSpec *pspec, gpointer user_data)
 {
@@ -711,6 +727,7 @@ set_modem (NMDeviceModem *self, NMModem *modem)
 	g_signal_connect (modem, "notify::" NM_MODEM_SIM_ID, G_CALLBACK (ids_changed_cb), self);
 	g_signal_connect (modem, "notify::" NM_MODEM_SIM_OPERATOR_ID, G_CALLBACK (ids_changed_cb), self);
 	g_signal_connect (modem, "notify::" NM_MODEM_OPERATOR_CODE, G_CALLBACK (operator_code_changed_cb), self);
+	g_signal_connect (modem, "notify::" NM_MODEM_APN, G_CALLBACK (apn_changed_cb), self);
 }
 
 static guint32
@@ -747,6 +764,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_OPERATOR_CODE:
 		g_value_set_string (value, priv->operator_code);
 		break;
+	case PROP_APN:
+		g_value_set_string (value, priv->apn);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -824,6 +844,7 @@ dispose (GObject *object)
 
 	g_clear_pointer (&priv->device_id, g_free);
 	g_clear_pointer (&priv->operator_code, g_free);
+	g_clear_pointer (&priv->apn, g_free);
 
 	G_OBJECT_CLASS (nm_device_modem_parent_class)->dispose (object);
 }
@@ -839,6 +860,7 @@ static const NMDBusInterfaceInfoExtended interface_info_device_modem = {
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("CurrentCapabilities", "u",  NM_DEVICE_MODEM_CURRENT_CAPABILITIES),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE   ("DeviceId",            "s",  NM_DEVICE_MODEM_DEVICE_ID),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE   ("OperatorCode",        "s",  NM_DEVICE_MODEM_OPERATOR_CODE),
+			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE   ("Apn",                 "s",  NM_DEVICE_MODEM_APN),
 		),
 	),
 	.legacy_property_changed = TRUE,
@@ -905,6 +927,13 @@ nm_device_modem_class_init (NMDeviceModemClass *klass)
 	obj_properties[PROP_OPERATOR_CODE] =
 	     g_param_spec_string (NM_DEVICE_MODEM_OPERATOR_CODE, "", "",
 	                          NULL,
+	                          G_PARAM_READABLE |
+	                          G_PARAM_STATIC_STRINGS);
+
+	obj_properties[PROP_APN] =
+	     g_param_spec_string (NM_DEVICE_MODEM_APN, "", "",
+	                          NULL,
+	                          G_PARAM_READABLE |
 	                          G_PARAM_STATIC_STRINGS);
 
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
diff --git a/src/devices/wwan/nm-device-modem.h b/src/devices/wwan/nm-device-modem.h
index 2cfc676573..eb3fd88a3d 100644
--- a/src/devices/wwan/nm-device-modem.h
+++ b/src/devices/wwan/nm-device-modem.h
@@ -36,6 +36,7 @@
 #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 #define NM_DEVICE_MODEM_DEVICE_ID            "device-id"
 #define NM_DEVICE_MODEM_OPERATOR_CODE        "operator-code"
+#define NM_DEVICE_MODEM_APN                  "apn"
 
 typedef struct _NMDeviceModem NMDeviceModem;
 typedef struct _NMDeviceModemClass NMDeviceModemClass;
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index 731c733866..753adece3f 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -549,6 +549,8 @@ connect_context_step (NMModemBroadband *self)
 			else
 				g_assert_not_reached ();
 
+			_nm_modem_set_apn (NM_MODEM (self), mm_simple_connect_properties_get_apn (ctx->connect_properties));
+
 			_LOGD ("launching connection with ip type '%s' (try %d)",
 			       nm_modem_ip_type_to_string (current),
 			       ctx->ip_type_tries + 1);
@@ -1159,6 +1161,7 @@ disconnect (NMModem *modem,
 	DisconnectContext *ctx;
 
 	connect_context_clear (self);
+	_nm_modem_set_apn (NM_MODEM (self), NULL);
 
 	ctx = g_slice_new0 (DisconnectContext);
 	ctx->self = g_object_ref (self);
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index e6017a63f9..9e55f302aa 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -53,6 +53,7 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMModem,
 	PROP_IP_TYPES,
 	PROP_SIM_OPERATOR_ID,
 	PROP_OPERATOR_CODE,
+	PROP_APN,
 );
 
 enum {
@@ -92,6 +93,7 @@ typedef struct _NMModemPrivate {
 	NMModemIPType ip_types;
 	char *sim_operator_id;
 	char *operator_code;
+	char *apn;
 
 	NMPPPManager *ppp_manager;
 
@@ -444,6 +446,12 @@ nm_modem_get_operator_code (NMModem *self)
 	return NM_MODEM_GET_PRIVATE (self)->operator_code;
 }
 
+const char *
+nm_modem_get_apn (NMModem *self)
+{
+	return NM_MODEM_GET_PRIVATE (self)->apn;
+}
+
 /*****************************************************************************/
 /* IP method PPP */
 
@@ -1597,6 +1605,18 @@ _nm_modem_set_operator_code (NMModem *self, const char *operator_code)
 	}
 }
 
+void
+_nm_modem_set_apn (NMModem *self, const char *apn)
+{
+	NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self);
+
+	if (g_strcmp0 (priv->apn, apn) != 0) {
+		g_free (priv->apn);
+		priv->apn = g_strdup (apn);
+		_notify (self, PROP_APN);
+	}
+}
+
 static void
 get_property (GObject *object, guint prop_id,
               GValue *value, GParamSpec *pspec)
@@ -1638,6 +1658,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_OPERATOR_CODE:
 		g_value_set_string (value, priv->operator_code);
 		break;
+	case PROP_APN:
+		g_value_set_string (value, priv->apn);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -1693,6 +1716,9 @@ set_property (GObject *object, guint prop_id,
 	case PROP_OPERATOR_CODE:
 		_nm_modem_set_operator_code (NM_MODEM (object), g_value_get_string (value));
 		break;
+	case PROP_APN:
+		_nm_modem_set_apn (NM_MODEM (object), g_value_get_string (value));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -1755,6 +1781,7 @@ finalize (GObject *object)
 	g_free (priv->sim_id);
 	g_free (priv->sim_operator_id);
 	g_free (priv->operator_code);
+	g_free (priv->apn);
 
 	G_OBJECT_CLASS (nm_modem_parent_class)->finalize (object);
 }
@@ -1841,6 +1868,13 @@ nm_modem_class_init (NMModemClass *klass)
 	obj_properties[PROP_OPERATOR_CODE] =
 	     g_param_spec_string (NM_MODEM_OPERATOR_CODE, "", "",
 	                          NULL,
+	                          G_PARAM_READWRITE | G_PARAM_CONSTRUCT |
+	                          G_PARAM_STATIC_STRINGS);
+
+	obj_properties[PROP_APN] =
+	     g_param_spec_string (NM_MODEM_APN, "", "",
+	                          NULL,
+	                          G_PARAM_READABLE |
 	                          G_PARAM_STATIC_STRINGS);
 
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h
index f32fedf53a..36f87af5fe 100644
--- a/src/devices/wwan/nm-modem.h
+++ b/src/devices/wwan/nm-modem.h
@@ -44,6 +44,7 @@
 #define NM_MODEM_IP_TYPES        "ip-types"   /* Supported IP types */
 #define NM_MODEM_SIM_OPERATOR_ID "sim-operator-id"
 #define NM_MODEM_OPERATOR_CODE   "operator-code"
+#define NM_MODEM_APN             "apn"
 
 /* Signals */
 #define NM_MODEM_PPP_STATS         "ppp-stats"
@@ -177,6 +178,7 @@ const char *nm_modem_get_sim_id          (NMModem *modem);
 const char *nm_modem_get_sim_operator_id (NMModem *modem);
 gboolean    nm_modem_get_iid             (NMModem *modem, NMUtilsIPv6IfaceId *out_iid);
 const char *nm_modem_get_operator_code   (NMModem *modem);
+const char *nm_modem_get_apn             (NMModem *modem);
 
 gboolean    nm_modem_set_data_port (NMModem *self,
                                     NMPlatform *platform,
@@ -289,5 +291,6 @@ const char *nm_modem_ip_type_to_string (NMModemIPType ip_type);
 guint32 nm_modem_get_configured_mtu (NMDevice *self, NMDeviceMtuSource *out_source);
 
 void _nm_modem_set_operator_code (NMModem *self, const char *operator_code);
+void _nm_modem_set_apn           (NMModem *self, const char *apn);
 
 #endif /* __NETWORKMANAGER_MODEM_H__ */

From 8e270de05e64ca8967ac8d456edeff30a78dd726 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 6 May 2019 17:47:01 +0200
Subject: [PATCH 8/8] libnm/modem: add APN getter

---
 libnm/libnm.ver         |  1 +
 libnm/nm-device-modem.c | 36 ++++++++++++++++++++++++++++++++++++
 libnm/nm-device-modem.h |  4 ++++
 3 files changed, 41 insertions(+)

diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 526ec0529d..36bdacdedb 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1607,6 +1607,7 @@ global:
 
 libnm_1_20_0 {
 global:
+	nm_device_modem_get_apn;
 	nm_device_modem_get_device_id;
 	nm_device_modem_get_operator_code;
 } libnm_1_18_0;
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index 4565d80228..97445d6f87 100644
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -38,6 +38,7 @@ typedef struct {
 	NMDeviceModemCapabilities current_caps;
 	char *device_id;
 	char *operator_code;
+	char *apn;
 } NMDeviceModemPrivate;
 
 enum {
@@ -46,6 +47,7 @@ enum {
 	PROP_CURRENT_CAPS,
 	PROP_DEVICE_ID,
 	PROP_OPERATOR_CODE,
+	PROP_APN,
 	LAST_PROP
 };
 
@@ -124,6 +126,24 @@ nm_device_modem_get_operator_code (NMDeviceModem *self)
 	return NM_DEVICE_MODEM_GET_PRIVATE (self)->operator_code;
 }
 
+/**
+ * nm_device_modem_get_apn:
+ * @self: a #NMDeviceModem
+ *
+ * The access point name the modem is connected to.
+ *
+ * Returns: the APN name or %NULL if disconnected
+ *
+ * Since: 1.20
+ **/
+const char *
+nm_device_modem_get_apn (NMDeviceModem *self)
+{
+	g_return_val_if_fail (NM_IS_DEVICE_MODEM (self), NULL);
+
+	return NM_DEVICE_MODEM_GET_PRIVATE (self)->apn;
+}
+
 static const char *
 get_type_description (NMDevice *device)
 {
@@ -208,6 +228,7 @@ init_dbus (NMObject *object)
 		{ NM_DEVICE_MODEM_CURRENT_CAPABILITIES, &priv->current_caps },
 		{ NM_DEVICE_MODEM_DEVICE_ID,            &priv->device_id },
 		{ NM_DEVICE_MODEM_OPERATOR_CODE,        &priv->operator_code },
+		{ NM_DEVICE_MODEM_APN,                  &priv->apn },
 		{ NULL },
 	};
 
@@ -225,6 +246,7 @@ finalize (GObject *object)
 
 	g_free (priv->device_id);
 	g_free (priv->operator_code);
+	g_free (priv->apn);
 
 	G_OBJECT_CLASS (nm_device_modem_parent_class)->finalize (object);
 }
@@ -250,6 +272,9 @@ get_property (GObject *object,
 	case PROP_OPERATOR_CODE:
 		g_value_set_string (value, nm_device_modem_get_operator_code (self));
 		break;
+	case PROP_APN:
+		g_value_set_string (value, nm_device_modem_get_apn (self));
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -329,4 +354,15 @@ nm_device_modem_class_init (NMDeviceModemClass *modem_class)
 		                     G_PARAM_READABLE |
 		                     G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * NMDeviceModem:apn:
+	 *
+	 * Since: 1.20
+	 **/
+	g_object_class_install_property
+		(object_class, PROP_CURRENT_CAPS,
+		 g_param_spec_string (NM_DEVICE_MODEM_APN, "", "",
+		                     NULL,
+		                     G_PARAM_READABLE |
+		                     G_PARAM_STATIC_STRINGS));
 }
diff --git a/libnm/nm-device-modem.h b/libnm/nm-device-modem.h
index c0f9886906..21d0ab77a1 100644
--- a/libnm/nm-device-modem.h
+++ b/libnm/nm-device-modem.h
@@ -41,6 +41,7 @@ G_BEGIN_DECLS
 #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 #define NM_DEVICE_MODEM_DEVICE_ID            "device-id"
 #define NM_DEVICE_MODEM_OPERATOR_CODE        "operator-code"
+#define NM_DEVICE_MODEM_APN                  "apn"
 
 /**
  * NMDeviceModem:
@@ -67,6 +68,9 @@ const char *nm_device_modem_get_device_id (NMDeviceModem *self);
 NM_AVAILABLE_IN_1_20
 const char *nm_device_modem_get_operator_code (NMDeviceModem *self);
 
+NM_AVAILABLE_IN_1_20
+const char *nm_device_modem_get_apn (NMDeviceModem *self);
+
 G_END_DECLS
 
 #endif /* __NM_DEVICE_MODEM_H__ */