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

broadband-modem-qmi: retrieve operator name from plmn_name based on current operator id.

Browse Source 
Retrieve operator name from plmn_name based on current operator id.
If service name is available, use service name as operator name.
If not, use the long or short name.
This commit is contained in:
Madhav
2021-01-14 23:24:12 +00:00
committed by Aleksander Morgado
parent abc417f37a
commit 830230dccb
1 changed files with 123 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
src/mm-broadband-modem-qmi.c
View File

@@ -2551,6 +2551,77 @@ modem_3gpp_load_operator_name_finish (MMIfaceModem3gpp *self,
return g_task_propagate_pointer (G_TASK (res), error);
}
static void
get_plmn_name_ready (QmiClientNas *client,
GAsyncResult *res,
GTask *task)
{
MMBroadbandModemQmi *self;
GError *error = NULL;
QmiNasNetworkDescriptionEncoding plmn_name_service_provider_name_encoding;
QmiNasNetworkDescriptionEncoding plmn_name_short_name_encoding;
QmiNasNetworkDescriptionEncoding plmn_name_long_name_encoding;
GArray *plmn_name_service_provider_name;
GArray *plmn_name_short_name;
GArray *plmn_name_long_name;
g_autoptr(QmiMessageNasGetPlmnNameOutput) output = NULL;
self = g_task_get_source_object (task);
output = qmi_client_nas_get_plmn_name_finish (client, res, &error);
if (!output) {
g_prefix_error (&error, "QMI operation failed: ");
g_task_return_error (task, error);
g_object_unref (task);
return;
}
if (!qmi_message_nas_get_plmn_name_output_get_result (output, &error)) {
g_task_return_error (task, error);
g_object_unref (task);
return;
}
if (qmi_message_nas_get_plmn_name_output_get_3gpp_eons_plmn_name (
output,
&plmn_name_service_provider_name_encoding,
&plmn_name_service_provider_name,
&plmn_name_short_name_encoding,
NULL,
NULL,
&plmn_name_short_name,
&plmn_name_long_name_encoding,
NULL,
NULL,
&plmn_name_long_name,
NULL)) {
g_autofree gchar *long_name = NULL;
g_autofree gchar *short_name = NULL;
g_autofree gchar *service_name = NULL;
long_name = qmi_nas_read_string_from_network_description_encoded_array (plmn_name_long_name_encoding, plmn_name_long_name);
short_name = qmi_nas_read_string_from_network_description_encoded_array (plmn_name_short_name_encoding, plmn_name_short_name);
service_name = qmi_nas_read_string_from_network_description_encoded_array (plmn_name_service_provider_name_encoding, plmn_name_service_provider_name);
mm_obj_dbg (self, "current operator long name: %s", long_name);
mm_obj_dbg (self, "current operator short name: %s", short_name);
mm_obj_dbg (self, "current operator service name: %s", service_name);
if (!self->priv->current_operator_description) {
self->priv->current_operator_description = (service_name ? g_steal_pointer (&service_name) :
(long_name ? g_steal_pointer (&long_name) :
(short_name ? g_steal_pointer (&short_name) :
NULL)));
}
}
if (!self->priv->current_operator_description)
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"Current operator description is still unknown and cannot be retrieved from MCC/MNC");
else
g_task_return_pointer (task, g_strdup (self->priv->current_operator_description), g_free);
g_object_unref (task);
}
static void
modem_3gpp_load_operator_name (MMIfaceModem3gpp *_self,
GAsyncReadyCallback callback,
@@ -2558,19 +2629,55 @@ modem_3gpp_load_operator_name (MMIfaceModem3gpp *_self,
{
MMBroadbandModemQmi *self = MM_BROADBAND_MODEM_QMI (_self);
GTask *task;
QmiClient *client;
guint16 mcc = 0;
guint16 mnc = 0;
g_autoptr(GError) error = NULL;
g_autoptr(QmiMessageNasGetPlmnNameInput) input = NULL;
task = g_task_new (self, NULL, callback, user_data);
if (self->priv->current_operator_description)
g_task_return_pointer (task,
g_strdup (self->priv->current_operator_description),
g_free);
else
g_task_return_new_error (task,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Current operator description is still unknown");
if (self->priv->current_operator_description) {
g_task_return_pointer (task, g_strdup (self->priv->current_operator_description), g_free);
g_object_unref (task);
return;
}
/* Check if operator id is set */
if (!self->priv->current_operator_id) {
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"Current operator id is still unknown");
g_object_unref (task);
return;
}
/* Parse input MCC/MNC */
if (!mm_3gpp_parse_operator_id (self->priv->current_operator_id, &mcc, &mnc, &error)) {
g_task_return_error (task, g_steal_pointer (&error));
g_object_unref (task);
return;
}
/* Try to get PLMN name from MCC/MNC */
client = mm_shared_qmi_peek_client (MM_SHARED_QMI (self),
QMI_SERVICE_NAS,
MM_PORT_QMI_FLAG_DEFAULT,
&error);
if (!client) {
g_task_return_error (task, g_steal_pointer (&error));
g_object_unref (task);
return;
}
input = qmi_message_nas_get_plmn_name_input_new ();
qmi_message_nas_get_plmn_name_input_set_plmn (input, mcc, mnc, NULL);
qmi_client_nas_get_plmn_name (QMI_CLIENT_NAS (client),
input,
5,
NULL,
(GAsyncReadyCallback)get_plmn_name_ready,
task);
}
/*****************************************************************************/