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

modem-helpers: rework +CGCONTRDP response parser

Browse Source 
We setup all output variables with g_autofree and then use
g_steal_pointer() to return the needed ones.
This commit is contained in:
Aleksander Morgado
2022-08-24 16:41:36 +00:00
parent 74fc5baca2
commit 845667c7b3
1 changed files with 31 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/mm-modem-helpers.c
View File

@@ -2335,13 +2335,13 @@ mm_3gpp_parse_cgcontrdp_response (const gchar *response,
GError *inner_error = NULL; GError *inner_error = NULL;
guint cid = 0; guint cid = 0;
guint bearer_id = 0; guint bearer_id = 0;
gchar *apn = NULL; g_autofree gchar *apn = NULL;
gchar *local_address_and_subnet = NULL; g_autofree gchar *local_address_and_subnet = NULL;
gchar *local_address = NULL; g_autofree gchar *local_address = NULL;
gchar *subnet = NULL; g_autofree gchar *subnet = NULL;
gchar *gateway_address = NULL; g_autofree gchar *gateway_address = NULL;
gchar *dns_primary_address = NULL; g_autofree gchar *dns_primary_address = NULL;
gchar *dns_secondary_address = NULL; g_autofree gchar *dns_secondary_address = NULL;
guint field_format_extra_index = 0; guint field_format_extra_index = 0;
/* Response may be e.g.: /* Response may be e.g.:
@@ -2371,27 +2371,27 @@ mm_3gpp_parse_cgcontrdp_response (const gchar *response,
g_assert (r != NULL); g_assert (r != NULL);
g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, &inner_error); g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, &inner_error);
if (inner_error) if (inner_error) {
goto out; g_propagate_error (error, inner_error);
return FALSE;
}
if (!g_match_info_matches (match_info)) { if (!g_match_info_matches (match_info)) {
inner_error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_INVALID_ARGS, "Couldn't match +CGCONTRDP response"); g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_INVALID_ARGS, "Couldn't match +CGCONTRDP response");
goto out; return FALSE;
} }
if (out_cid && !mm_get_uint_from_match_info (match_info, 1, &cid)) { if (out_cid && !mm_get_uint_from_match_info (match_info, 1, &cid)) {
inner_error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "Error parsing cid"); g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "Error parsing cid");
goto out; return FALSE;
} }
if (out_bearer_id && !mm_get_uint_from_match_info (match_info, 2, &bearer_id)) { if (out_bearer_id && !mm_get_uint_from_match_info (match_info, 2, &bearer_id)) {
inner_error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "Error parsing bearer id"); g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "Error parsing bearer id");
goto out; return FALSE;
} }
/* Remaining strings are optional or empty allowed */ /* Remaining strings are optional or empty allowed */
if (out_apn)
apn = mm_get_string_unquoted_from_match_info (match_info, 3); apn = mm_get_string_unquoted_from_match_info (match_info, 3);
/* /*
@@ -2400,64 +2400,39 @@ mm_3gpp_parse_cgcontrdp_response (const gchar *response,
*/ */
local_address_and_subnet = mm_get_string_unquoted_from_match_info (match_info, 4); local_address_and_subnet = mm_get_string_unquoted_from_match_info (match_info, 4);
if (local_address_and_subnet && !split_local_address_and_subnet (local_address_and_subnet, &local_address, &subnet)) { if (local_address_and_subnet && !split_local_address_and_subnet (local_address_and_subnet, &local_address, &subnet)) {
inner_error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "Error parsing local address and subnet"); g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "Error parsing local address and subnet");
goto out; return FALSE;
} }
/* If we don't have a subnet in field 4, we're using the old format with subnet in an extra field */ /* If we don't have a subnet in field 4, we're using the old format with subnet in an extra field */
if (!subnet) { if (!subnet) {
if (out_subnet)
subnet = mm_get_string_unquoted_from_match_info (match_info, 5); subnet = mm_get_string_unquoted_from_match_info (match_info, 5);
field_format_extra_index = 1; field_format_extra_index = 1;
} }
if (out_gateway_address)
gateway_address = mm_get_string_unquoted_from_match_info (match_info, 5 + field_format_extra_index); gateway_address = mm_get_string_unquoted_from_match_info (match_info, 5 + field_format_extra_index);
if (out_dns_primary_address)
dns_primary_address = mm_get_string_unquoted_from_match_info (match_info, 6 + field_format_extra_index); dns_primary_address = mm_get_string_unquoted_from_match_info (match_info, 6 + field_format_extra_index);
if (out_dns_secondary_address)
dns_secondary_address = mm_get_string_unquoted_from_match_info (match_info, 7 + field_format_extra_index); dns_secondary_address = mm_get_string_unquoted_from_match_info (match_info, 7 + field_format_extra_index);
out:
g_free (local_address_and_subnet);
if (inner_error) {
g_free (apn);
g_free (local_address);
g_free (subnet);
g_free (gateway_address);
g_free (dns_primary_address);
g_free (dns_secondary_address);
g_propagate_error (error, inner_error);
return FALSE;
}
if (out_cid) if (out_cid)
*out_cid = cid; *out_cid = cid;
if (out_bearer_id) if (out_bearer_id)
*out_bearer_id = bearer_id; *out_bearer_id = bearer_id;
if (out_apn) if (out_apn)
*out_apn = apn; *out_apn = g_steal_pointer (&apn);
/* Local address and subnet may always be retrieved, even if not requested /* Local address and subnet may always be retrieved, even if not requested
* by the caller, as we need them to know which +CGCONTRDP=[cid] response is * by the caller, as we need them to know which +CGCONTRDP=[cid] response is
* being parsed. So make sure we free them if not needed. */ * being parsed. So make sure we free them if not needed. */
if (out_local_address) if (out_local_address)
*out_local_address = local_address; *out_local_address = g_steal_pointer (&local_address);
else
g_free (local_address);
if (out_subnet) if (out_subnet)
*out_subnet = subnet; *out_subnet = g_steal_pointer (&subnet);
else
g_free (subnet);
if (out_gateway_address) if (out_gateway_address)
*out_gateway_address = gateway_address; *out_gateway_address = g_steal_pointer (&gateway_address);
if (out_dns_primary_address) if (out_dns_primary_address)
*out_dns_primary_address = dns_primary_address; *out_dns_primary_address = g_steal_pointer (&dns_primary_address);
if (out_dns_secondary_address) if (out_dns_secondary_address)
*out_dns_secondary_address = dns_secondary_address; *out_dns_secondary_address = g_steal_pointer (&dns_secondary_address);
return TRUE; return TRUE;
} }