diff options
Diffstat (limited to 'cli/mmcli-sms.c')
| -rw-r--r-- | cli/mmcli-sms.c | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/cli/mmcli-sms.c b/cli/mmcli-sms.c index 4124f66..c49c8e8 100644 --- a/cli/mmcli-sms.c +++ b/cli/mmcli-sms.c @@ -180,42 +180,56 @@ print_sms_info (MMSms *sms) g_print (" -----------------------------------\n" " Properties | PDU type: '%s'\n" - " | state: '%s'\n" - " | smsc: '%s'\n", + " | state: '%s'\n", mm_sms_pdu_type_get_string (pdu_type), - mm_sms_state_get_string (mm_sms_get_state (sms)), - VALIDATE (mm_sms_get_smsc (sms))); + mm_sms_state_get_string (mm_sms_get_state (sms))); if (mm_sms_get_validity_type (sms) == MM_SMS_VALIDITY_TYPE_RELATIVE) g_print (" | validity (relative): '%u'\n", mm_sms_get_validity_relative (sms)); - g_print (" | class: '%d'\n" - " | storage: '%s'\n", - mm_sms_get_class (sms), + g_print (" | storage: '%s'\n", mm_sms_storage_get_string (mm_sms_get_storage (sms))); + /* Print properties which are set, regardless of the pdu type */ + + if (mm_sms_get_smsc (sms)) + g_print (" | smsc: '%s'\n", + mm_sms_get_smsc (sms)); + + if (mm_sms_get_class (sms) >= 0) + g_print (" | class: '%d'\n", + mm_sms_get_class (sms)); + + if (mm_sms_get_teleservice_id (sms) != MM_SMS_CDMA_TELESERVICE_ID_UNKNOWN) + g_print (" | teleservice id: '%s'\n", + mm_sms_cdma_teleservice_id_get_string (mm_sms_get_teleservice_id (sms))); + + if (mm_sms_get_service_category (sms) != MM_SMS_CDMA_SERVICE_CATEGORY_UNKNOWN) + g_print (" | service category: '%s'\n", + mm_sms_cdma_service_category_get_string (mm_sms_get_service_category (sms))); + + /* Delivery report request just in 3GPP submit PDUs */ if (pdu_type == MM_SMS_PDU_TYPE_SUBMIT) g_print (" | delivery report: '%s'\n", mm_sms_get_delivery_report_request (sms) ? "requested" : "not requested"); - if (pdu_type == MM_SMS_PDU_TYPE_STATUS_REPORT || - pdu_type == MM_SMS_PDU_TYPE_SUBMIT) + if (mm_sms_get_message_reference (sms) != 0) g_print (" | message reference: '%u'\n", mm_sms_get_message_reference (sms)); - if (pdu_type == MM_SMS_PDU_TYPE_STATUS_REPORT || - pdu_type == MM_SMS_PDU_TYPE_DELIVER) + if (mm_sms_get_timestamp (sms)) g_print (" | timestamp: '%s'\n", - VALIDATE (mm_sms_get_timestamp (sms))); + mm_sms_get_timestamp (sms)); - if (pdu_type == MM_SMS_PDU_TYPE_STATUS_REPORT) { + if (mm_sms_get_delivery_state (sms) != MM_SMS_DELIVERY_STATE_UNKNOWN) g_print (" | delivery state: '%s' (0x%X)\n", VALIDATE (mm_sms_delivery_state_get_string_extended (mm_sms_get_delivery_state (sms))), mm_sms_get_delivery_state (sms)); + + if (mm_sms_get_discharge_timestamp (sms)) g_print (" | discharge timestamp: '%s'\n", - VALIDATE (mm_sms_get_discharge_timestamp (sms))); - } + mm_sms_get_discharge_timestamp (sms)); } static void |