diff options
| author | Yang Gu <yang.gu@intel.com> | 2010-05-10 18:38:59 +0800 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-05-11 14:36:37 -0500 |
| commit | 8a33071cd0321b0dfdd8b5a92294d0f5ca21a58f (patch) | |
| tree | b107018e4d10faf248224250a447eb478b66cb15 | |
| parent | 9d56691898912db5f9ebffca057baea6ad8338b8 (diff) | |
| download | ofono-8a33071cd0321b0dfdd8b5a92294d0f5ca21a58f.tar.bz2 | |
stkutil: Parse cdma tpdu in send sms parser
| -rw-r--r-- | src/stkutil.c | 16 | ||||
| -rw-r--r-- | src/stkutil.h | 1 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/stkutil.c b/src/stkutil.c index 44cef107..7d89a636 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -2234,13 +2234,14 @@ static void destroy_send_sms(struct stk_command *command) { g_free(command->send_sms.alpha_id); g_free(command->send_sms.address.number); + g_free(command->send_sms.cdma_sms.array); } static gboolean parse_send_sms(struct stk_command *command, struct comprehension_tlv_iter *iter) { struct stk_command_send_sms *obj = &command->send_sms; - struct gsm_sms_tpdu tpdu; + struct gsm_sms_tpdu gsm_tpdu; gboolean ret; if (command->src != STK_DEVICE_IDENTITY_TYPE_UICC) @@ -2254,7 +2255,9 @@ static gboolean parse_send_sms(struct stk_command *command, STK_DATA_OBJECT_TYPE_ADDRESS, 0, &obj->address, STK_DATA_OBJECT_TYPE_GSM_SMS_TPDU, 0, - &tpdu, + &gsm_tpdu, + STK_DATA_OBJECT_TYPE_CDMA_SMS_TPDU, 0, + &obj->cdma_sms, STK_DATA_OBJECT_TYPE_ICON_ID, 0, &obj->icon_id, STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE, 0, @@ -2268,8 +2271,13 @@ static gboolean parse_send_sms(struct stk_command *command, command->destructor = destroy_send_sms; - if (sms_decode(tpdu.tpdu, tpdu.len, TRUE, tpdu.len, &obj->gsm_sms) - == FALSE) { + if (gsm_tpdu.len > 0) { + if (sms_decode(gsm_tpdu.tpdu, gsm_tpdu.len, TRUE, gsm_tpdu.len, + &obj->gsm_sms) == FALSE) { + command->destructor(command); + return FALSE; + } + } else if (obj->cdma_sms.len == 0) { command->destructor(command); return FALSE; } diff --git a/src/stkutil.h b/src/stkutil.h index 00c001bd..2d34ca4d 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -828,6 +828,7 @@ struct stk_command_send_sms { char *alpha_id; struct stk_address address; struct sms gsm_sms; + struct stk_common_byte_array cdma_sms; struct stk_icon_id icon_id; struct stk_text_attribute text_attr; struct stk_frame_id frame_id; |