colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm/modem: add network id getter

Browse Source
This commit is contained in:
Lubomir Rintel
2019-05-06 17:46:31 +02:00
parent bba4a37a59
commit 0b3dd18c2b
3 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libnm/libnm.ver
View File

@@ -1608,4 +1608,5 @@ global:
libnm_1_20_0 { libnm_1_20_0 {
global: global:
nm_device_modem_get_device_id; nm_device_modem_get_device_id;
nm_device_modem_get_operator_code;
} libnm_1_18_0; } libnm_1_18_0;

37
libnm/nm-device-modem.c
View File

@@ -37,6 +37,7 @@ typedef struct {
NMDeviceModemCapabilities caps; NMDeviceModemCapabilities caps;
NMDeviceModemCapabilities current_caps; NMDeviceModemCapabilities current_caps;
char *device_id; char *device_id;
char *operator_code;
} NMDeviceModemPrivate; } NMDeviceModemPrivate;
enum { enum {
@@ -44,6 +45,7 @@ enum {
PROP_MODEM_CAPS, PROP_MODEM_CAPS,
PROP_CURRENT_CAPS, PROP_CURRENT_CAPS,
PROP_DEVICE_ID, PROP_DEVICE_ID,
PROP_OPERATOR_CODE,
LAST_PROP LAST_PROP
}; };
@@ -104,6 +106,24 @@ nm_device_modem_get_device_id (NMDeviceModem *self)
return NM_DEVICE_MODEM_GET_PRIVATE (self)->device_id; 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 * static const char *
get_type_description (NMDevice *device) get_type_description (NMDevice *device)
{ {
@@ -187,6 +207,7 @@ init_dbus (NMObject *object)
{ NM_DEVICE_MODEM_MODEM_CAPABILITIES, &priv->caps }, { NM_DEVICE_MODEM_MODEM_CAPABILITIES, &priv->caps },
{ NM_DEVICE_MODEM_CURRENT_CAPABILITIES, &priv->current_caps }, { NM_DEVICE_MODEM_CURRENT_CAPABILITIES, &priv->current_caps },
{ NM_DEVICE_MODEM_DEVICE_ID, &priv->device_id }, { NM_DEVICE_MODEM_DEVICE_ID, &priv->device_id },
{ NM_DEVICE_MODEM_OPERATOR_CODE, &priv->operator_code },
{ NULL }, { NULL },
}; };
@@ -203,6 +224,7 @@ finalize (GObject *object)
NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (object); NMDeviceModemPrivate *priv = NM_DEVICE_MODEM_GET_PRIVATE (object);
g_free (priv->device_id); g_free (priv->device_id);
g_free (priv->operator_code);
G_OBJECT_CLASS (nm_device_modem_parent_class)->finalize (object); G_OBJECT_CLASS (nm_device_modem_parent_class)->finalize (object);
} }
@@ -225,6 +247,9 @@ get_property (GObject *object,
case PROP_DEVICE_ID: case PROP_DEVICE_ID:
g_value_set_string (value, nm_device_modem_get_device_id (self)); g_value_set_string (value, nm_device_modem_get_device_id (self));
break; break;
case PROP_OPERATOR_CODE:
g_value_set_string (value, nm_device_modem_get_operator_code (self));
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@@ -292,4 +317,16 @@ nm_device_modem_class_init (NMDeviceModemClass *modem_class)
G_PARAM_READABLE | G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS)); 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));
} }

4
libnm/nm-device-modem.h
View File

@@ -40,6 +40,7 @@ G_BEGIN_DECLS
#define NM_DEVICE_MODEM_MODEM_CAPABILITIES "modem-capabilities" #define NM_DEVICE_MODEM_MODEM_CAPABILITIES "modem-capabilities"
#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities" #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
#define NM_DEVICE_MODEM_DEVICE_ID "device-id" #define NM_DEVICE_MODEM_DEVICE_ID "device-id"
#define NM_DEVICE_MODEM_OPERATOR_CODE "operator-code"
/** /**
* NMDeviceModem: * NMDeviceModem:
@@ -63,6 +64,9 @@ NMDeviceModemCapabilities nm_device_modem_get_current_capabilities (NMDeviceMode
NM_AVAILABLE_IN_1_20 NM_AVAILABLE_IN_1_20
const char *nm_device_modem_get_device_id (NMDeviceModem *self); 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 G_END_DECLS
#endif /* __NM_DEVICE_MODEM_H__ */ #endif /* __NM_DEVICE_MODEM_H__ */