diff options
Diffstat (limited to 'src/mm-modem-helpers.c')
| -rw-r--r-- | src/mm-modem-helpers.c | 89 |
1 files changed, 73 insertions, 16 deletions
diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index b6b7f113..a0702200 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -5131,12 +5131,14 @@ out: gboolean mm_sim_parse_cpol_query_response (const gchar *response, + guint *out_index, gchar **out_operator_code, gboolean *out_gsm_act, gboolean *out_gsm_compact_act, gboolean *out_utran_act, gboolean *out_eutran_act, gboolean *out_ngran_act, + guint *out_act_count, GError **error) { g_autoptr(GMatchInfo) match_info = NULL; @@ -5146,7 +5148,7 @@ mm_sim_parse_cpol_query_response (const gchar *response, guint act = 0; guint match_count; - r = g_regex_new ("\\+CPOL:\\s*\\d+,\\s*(\\d+),\\s*\"(\\d+)\"" + r = g_regex_new ("\\+CPOL:\\s*(\\d+),\\s*(\\d+),\\s*\"(\\d+)\"" "(?:,\\s*(\\d+))?" /* GSM_AcTn */ "(?:,\\s*(\\d+))?" /* GSM_Compact_AcTn */ "(?:,\\s*(\\d+))?" /* UTRAN_AcTn */ @@ -5165,10 +5167,10 @@ mm_sim_parse_cpol_query_response (const gchar *response, match_count = g_match_info_get_match_count (match_info); /* Remember that g_match_info_get_match_count() includes match #0 */ - g_assert (match_count >= 3); + g_assert (match_count >= 4); - if (!mm_get_uint_from_match_info (match_info, 1, &format) || - !(operator_code = mm_get_string_unquoted_from_match_info (match_info, 2))) { + if (!mm_get_uint_from_match_info (match_info, 2, &format) || + !(operator_code = mm_get_string_unquoted_from_match_info (match_info, 3))) { g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, @@ -5184,29 +5186,84 @@ mm_sim_parse_cpol_query_response (const gchar *response, return FALSE; } - if (out_operator_code) { + if (out_index) + if (!mm_get_uint_from_match_info (match_info, 1, out_index)) { + g_set_error (error, + MM_CORE_ERROR, + MM_CORE_ERROR_FAILED, + "Couldn't parse +CPOL index: %s", response); + return FALSE; + } + if (out_operator_code) *out_operator_code = g_steal_pointer (&operator_code); - } if (out_gsm_act) - *out_gsm_act = match_count >= 4 && - mm_get_uint_from_match_info (match_info, 3, &act) && + *out_gsm_act = match_count >= 5 && + mm_get_uint_from_match_info (match_info, 4, &act) && act != 0; if (out_gsm_compact_act) - *out_gsm_compact_act = match_count >= 5 && - mm_get_uint_from_match_info (match_info, 4, &act) && + *out_gsm_compact_act = match_count >= 6 && + mm_get_uint_from_match_info (match_info, 5, &act) && act != 0; if (out_utran_act) - *out_utran_act = match_count >= 6 && - mm_get_uint_from_match_info (match_info, 5, &act) && + *out_utran_act = match_count >= 7 && + mm_get_uint_from_match_info (match_info, 6, &act) && act != 0; if (out_eutran_act) - *out_eutran_act = match_count >= 7 && - mm_get_uint_from_match_info (match_info, 6, &act) && + *out_eutran_act = match_count >= 8 && + mm_get_uint_from_match_info (match_info, 7, &act) && act != 0; if (out_ngran_act) - *out_ngran_act = match_count >= 8 && - mm_get_uint_from_match_info (match_info, 7, &act) && + *out_ngran_act = match_count >= 9 && + mm_get_uint_from_match_info (match_info, 8, &act) && act != 0; + /* number of access technologies (0...5) in modem response */ + if (out_act_count) + *out_act_count = match_count - 4; + + return TRUE; +} + +gboolean +mm_sim_parse_cpol_test_response (const gchar *response, + guint *out_min_index, + guint *out_max_index, + GError **error) +{ + g_autoptr(GMatchInfo) match_info = NULL; + g_autoptr(GRegex) r = NULL; + guint match_count; + guint min_index; + guint max_index; + + r = g_regex_new ("\\+CPOL:\\s*\\((\\d+)\\s*-\\s*(\\d+)\\)", + G_REGEX_RAW, 0, NULL); + g_regex_match (r, response, 0, &match_info); + + if (!g_match_info_matches (match_info)) { + g_set_error (error, + MM_CORE_ERROR, + MM_CORE_ERROR_FAILED, + "Couldn't parse +CPOL=? reply: %s", response); + return FALSE; + } + + match_count = g_match_info_get_match_count (match_info); + /* Remember that g_match_info_get_match_count() includes match #0 */ + g_assert (match_count >= 3); + + if (!mm_get_uint_from_match_info (match_info, 1, &min_index) || + !mm_get_uint_from_match_info (match_info, 2, &max_index)) { + g_set_error (error, + MM_CORE_ERROR, + MM_CORE_ERROR_FAILED, + "Couldn't parse indices in +CPOL=? reply: %s", response); + return FALSE; + } + + if (out_min_index) + *out_min_index = min_index; + if (out_max_index) + *out_max_index = max_index; return TRUE; } |