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

cli,modem: print PCO as 'n/a' if not available

Browse Source
This commit is contained in:
Aleksander Morgado
2018-10-06 14:57:58 +02:00
parent 24454b2775
commit 1ac79ccdfd
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
cli/mmcli-modem.c
View File

@@ -461,7 +461,7 @@ print_modem_info (void)
/* If available, 3GPP related stuff */ /* If available, 3GPP related stuff */
if (ctx->modem_3gpp) { if (ctx->modem_3gpp) {
gchar *facility_locks; gchar *facility_locks;
GList *pco_list, *l; GList *pco_list;
facility_locks = (mm_modem_3gpp_facility_build_string_from_mask ( facility_locks = (mm_modem_3gpp_facility_build_string_from_mask (
mm_modem_3gpp_get_enabled_facility_locks (ctx->modem_3gpp))); mm_modem_3gpp_get_enabled_facility_locks (ctx->modem_3gpp)));
@@ -473,8 +473,7 @@ print_modem_info (void)
" | operator name: '%s'\n" " | operator name: '%s'\n"
" | subscription: '%s'\n" " | subscription: '%s'\n"
" | registration: '%s'\n" " | registration: '%s'\n"
" | EPS UE mode: '%s'\n" " | EPS UE mode: '%s'\n",
" | PCO:\n",
VALIDATE_UNKNOWN (mm_modem_3gpp_get_imei (ctx->modem_3gpp)), VALIDATE_UNKNOWN (mm_modem_3gpp_get_imei (ctx->modem_3gpp)),
facility_locks, facility_locks,
VALIDATE_UNKNOWN (mm_modem_3gpp_get_operator_code (ctx->modem_3gpp)), VALIDATE_UNKNOWN (mm_modem_3gpp_get_operator_code (ctx->modem_3gpp)),
@@ -486,25 +485,31 @@ print_modem_info (void)
mm_modem_3gpp_eps_ue_mode_operation_get_string ( mm_modem_3gpp_eps_ue_mode_operation_get_string (
mm_modem_3gpp_get_eps_ue_mode_operation (ctx->modem_3gpp))); mm_modem_3gpp_get_eps_ue_mode_operation (ctx->modem_3gpp)));
for (l = pco_list; l; l = g_list_next (l)) { if (pco_list) {
MMPco *pco = MM_PCO (l->data); GList *l;
gchar *pco_data_hex = NULL;
const guint8 *pco_data;
gsize pco_data_size;
pco_data = mm_pco_get_data (pco, &pco_data_size); g_print (" | PCO:\n");
if (pco_data) for (l = pco_list; l; l = g_list_next (l)) {
pco_data_hex = mm_utils_bin2hexstr (pco_data, pco_data_size); MMPco *pco = MM_PCO (l->data);
gchar *pco_data_hex = NULL;
const guint8 *pco_data;
gsize pco_data_size;
g_print (" | %u: (%s) '%s'\n", pco_data = mm_pco_get_data (pco, &pco_data_size);
mm_pco_get_session_id (pco), if (pco_data)
mm_pco_is_complete (pco) ? "complete" : "partial", pco_data_hex = mm_utils_bin2hexstr (pco_data, pco_data_size);
pco_data_hex ? pco_data_hex : "");
g_free (pco_data_hex); g_print (" | %u: (%s) '%s'\n",
} mm_pco_get_session_id (pco),
mm_pco_is_complete (pco) ? "complete" : "partial",
pco_data_hex ? pco_data_hex : "");
g_free (pco_data_hex);
}
mm_pco_list_free (pco_list);
} else
g_print (" | PCO: 'n/a'\n");
g_free (facility_locks); g_free (facility_locks);
mm_pco_list_free (pco_list);
} }
/* If available, CDMA related stuff */ /* If available, CDMA related stuff */