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

libmm-glib,mmcli: add mm_sim_get_eid and add EID to mmcli output

Browse Source 
This exposes the new EID property of the SIM object on mmcli.
This commit is contained in:
Eric Caruso
2020-10-16 12:28:10 -07:00
committed by Aleksander Morgado
parent e24a8240cb
commit 61739ab934
6 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cli/mmcli-output.c
View File

@@ -269,6 +269,7 @@ static FieldInfo field_infos[] = {
[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, },

1
cli/mmcli-output.h
View File

@@ -286,6 +286,7 @@ typedef enum {
MMC_F_SIM_PROPERTIES_ACTIVE,
MMC_F_SIM_PROPERTIES_IMSI,
MMC_F_SIM_PROPERTIES_ICCID,
MMC_F_SIM_PROPERTIES_EID,
MMC_F_SIM_PROPERTIES_OPERATOR_ID,
MMC_F_SIM_PROPERTIES_OPERATOR_NAME,
MMC_F_SIM_PROPERTIES_EMERGENCY_NUMBERS,

1
cli/mmcli-sim.c
View File

@@ -162,6 +162,7 @@ print_sim_info (MMSim *sim)
mmcli_output_string (MMC_F_SIM_PROPERTIES_ACTIVE, mm_sim_get_active (sim) ? "yes" : "no");
mmcli_output_string (MMC_F_SIM_PROPERTIES_IMSI, mm_sim_get_imsi (sim));
mmcli_output_string (MMC_F_SIM_PROPERTIES_ICCID, mm_sim_get_identifier (sim));
mmcli_output_string (MMC_F_SIM_PROPERTIES_EID, mm_sim_get_eid (sim));
mmcli_output_string (MMC_F_SIM_PROPERTIES_OPERATOR_ID, mm_sim_get_operator_identifier (sim));
mmcli_output_string (MMC_F_SIM_PROPERTIES_OPERATOR_NAME, mm_sim_get_operator_name (sim));
mmcli_output_string_array (MMC_F_SIM_PROPERTIES_EMERGENCY_NUMBERS, (const gchar **) mm_sim_get_emergency_numbers (sim), FALSE);

2
docs/reference/libmm-glib/libmm-glib-sections.txt
View File

@@ -1223,6 +1223,8 @@ mm_sim_get_identifier
mm_sim_dup_identifier
mm_sim_get_imsi
mm_sim_dup_imsi
mm_sim_get_eid
mm_sim_dup_eid
mm_sim_get_operator_identifier
mm_sim_dup_operator_identifier
mm_sim_get_operator_name

46
libmm-glib/mm-sim.c
View File

@@ -201,6 +201,52 @@ mm_sim_dup_imsi (MMSim *self)
/*****************************************************************************/
/**
* mm_sim_get_eid:
* @self: A #MMSim.
*
* Gets the Embedded UICC ID (or EID) of the #MMSim object.
*
* <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_sim_dup_eid() if on another thread.</warning>
*
* Returns: (transfer none): The EID of the #MMSim object, or %NULL if it
* couldn't be retrieved.
*
* Since: 1.16
*/
const gchar *
mm_sim_get_eid (MMSim *self)
{
g_return_val_if_fail (MM_IS_SIM (self), NULL);
RETURN_NON_EMPTY_CONSTANT_STRING (
mm_gdbus_sim_get_eid (MM_GDBUS_SIM (self)));
}
/**
* mm_sim_dup_eid:
* @self: A #MMSim.
*
* Gets a copy of the Embedded UICC ID (EID) of the #MMSim object.
*
* Returns: (transfer full): The EID of the #MMSim object, or %NULL if it
* couldn't be retrieved. The returned value should be freed with g_free().
*
* Since: 1.16
*/
gchar *
mm_sim_dup_eid (MMSim *self)
{
g_return_val_if_fail (MM_IS_SIM (self), NULL);
RETURN_NON_EMPTY_STRING (
mm_gdbus_sim_dup_eid (MM_GDBUS_SIM (self)));
}
/*****************************************************************************/
/**
* mm_sim_get_operator_identifier:
* @self: A #MMSim.

3
libmm-glib/mm-sim.h
View File

@@ -75,6 +75,9 @@ gchar *mm_sim_dup_identifier (MMSim *self);
const gchar *mm_sim_get_imsi (MMSim *self);
gchar *mm_sim_dup_imsi (MMSim *self);
const gchar *mm_sim_get_eid (MMSim *self);
gchar *mm_sim_dup_eid (MMSim *self);
const gchar *mm_sim_get_operator_identifier (MMSim *self);
gchar *mm_sim_dup_operator_identifier (MMSim *self);