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

shared-qmi: if requested config not installed, fallback to generic

Browse Source 
If there is a known match for a specific config, but the config is not
available in the module, we should fallback to the generic
configuration.
This commit is contained in:
Aleksander Morgado
2019-02-26 14:57:40 +01:00
parent 0029f846cd
commit c09e8c8a2a
1 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/mm-shared-qmi.c
View File

@@ -2203,6 +2203,8 @@ find_requested_carrier_config (GTask *task)
Private *priv; Private *priv;
gchar mccmnc[7]; gchar mccmnc[7];
gchar *group; gchar *group;
gint config_fallback_i = -1;
gchar *config_fallback = NULL;
ctx = g_task_get_task_data (task); ctx = g_task_get_task_data (task);
priv = get_private (g_task_get_source_object (task)); priv = get_private (g_task_get_source_object (task));
@@ -2210,38 +2212,29 @@ find_requested_carrier_config (GTask *task)
/* Only one group expected per file, so get the start one */ /* Only one group expected per file, so get the start one */
group = g_key_file_get_start_group (ctx->keyfile); group = g_key_file_get_start_group (ctx->keyfile);
/* Match generic configuration */
config_fallback = g_key_file_get_string (ctx->keyfile, group, GENERIC_CONFIG_FALLBACK, NULL);
mm_dbg ("Fallback carrier configuration %sfound in group '%s'", config_fallback ? "" : "not ", group);
/* First, try to match 6 MCCMNC digits (3-digit MNCs) */ /* First, try to match 6 MCCMNC digits (3-digit MNCs) */
strncpy (mccmnc, ctx->imsi, 6); strncpy (mccmnc, ctx->imsi, 6);
mccmnc[6] = '\0'; mccmnc[6] = '\0';
ctx->config_requested = g_key_file_get_string (ctx->keyfile, group, mccmnc, NULL); ctx->config_requested = g_key_file_get_string (ctx->keyfile, group, mccmnc, NULL);
if (ctx->config_requested) { if (!ctx->config_requested) {
mm_dbg ("Requested carrier configuration found for '%s' in group '%s': %s", mccmnc, group, ctx->config_requested);
goto out_config;
}
/* If not found, try to match 5 MCCMNC digits (2-digit MNCs) */ /* If not found, try to match 5 MCCMNC digits (2-digit MNCs) */
mccmnc[5] = '\0'; mccmnc[5] = '\0';
ctx->config_requested = g_key_file_get_string (ctx->keyfile, group, mccmnc, NULL); ctx->config_requested = g_key_file_get_string (ctx->keyfile, group, mccmnc, NULL);
if (ctx->config_requested) {
mm_dbg ("Requested carrier configuration found for '%s' in group '%s': %s", mccmnc, group, ctx->config_requested);
goto out_config;
} }
mm_dbg ("Requested carrier configuration %sfound for '%s' in group '%s': %s",
ctx->config_requested ? "" : "not ", mccmnc, group, ctx->config_requested ? ctx->config_requested : "n/a");
/* If not found, try to match the generic configuration */ if (!ctx->config_requested && !config_fallback) {
ctx->config_requested = g_key_file_get_string (ctx->keyfile, group, GENERIC_CONFIG_FALLBACK, NULL);
if (ctx->config_requested) {
mm_dbg ("Fallback carrier configuration found for '%s' in group '%s'", mccmnc, group);
goto out_config;
}
out_config:
if (!ctx->config_requested) {
setup_carrier_config_abort (task, g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_NOT_FOUND, setup_carrier_config_abort (task, g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_NOT_FOUND,
"no requested configuration found in group '%s'", group)); "no valid configuration found in group '%s'", group));
goto out; goto out;
} }
/* Now, look for the configuration among the ones available in the device */ /* Now, look for the configurations among the ones available in the device */
if (priv->config_list) { if (priv->config_list) {
guint i; guint i;
@@ -2249,24 +2242,41 @@ out_config:
ConfigInfo *config; ConfigInfo *config;
config = &g_array_index (priv->config_list, ConfigInfo, i); config = &g_array_index (priv->config_list, ConfigInfo, i);
if (!g_strcmp0 (ctx->config_requested, config->description)) { if (ctx->config_requested && !g_strcmp0 (ctx->config_requested, config->description)) {
mm_dbg ("Requested carrier configuration '%s' is available", ctx->config_requested); mm_dbg ("Requested carrier configuration '%s' is available", ctx->config_requested);
ctx->config_requested_i = i; ctx->config_requested_i = i;
} }
if (config_fallback && !g_strcmp0 (config_fallback, config->description)) {
mm_dbg ("Fallback carrier configuration '%s' is available", config_fallback);
config_fallback_i = i;
}
} }
} }
/* Fail operation if we didn't find the one we want */ /* Fail operation if we didn't find the one we want */
if (ctx->config_requested_i < 0) { if ((ctx->config_requested_i < 0) && (config_fallback_i < 0)) {
setup_carrier_config_abort (task, g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED, setup_carrier_config_abort (task, g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"requested carrier configuration '%s' is not available", "carrier configurations (requested '%s', fallback '%s') are not available",
ctx->config_requested)); ctx->config_requested, config_fallback));
} else { goto out;
}
/* If the mapping expects a given config, but the config isn't installed,
* we fallback to generic */
if (ctx->config_requested_i < 0) {
g_assert (config_fallback_i >= 0);
mm_dbg ("Using fallback carrier configuration");
g_free (ctx->config_requested);
ctx->config_requested = config_fallback;
ctx->config_requested_i = config_fallback_i;
config_fallback = NULL;
}
ctx->step++; ctx->step++;
setup_carrier_config_step (task); setup_carrier_config_step (task);
}
out:
out:
g_free (config_fallback);
g_free (group); g_free (group);
} }