diff --git a/src/stkutil.c b/src/stkutil.c index 47b18de4..3bc2a0f5 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -2796,6 +2796,45 @@ static gboolean parse_run_at_command(struct stk_command *command, return TRUE; } +static void destroy_send_dtmf(struct stk_command *command) +{ + g_free(command->send_dtmf.alpha_id); + g_free(command->send_dtmf.dtmf); +} + +static gboolean parse_send_dtmf(struct stk_command *command, + struct comprehension_tlv_iter *iter) +{ + struct stk_command_send_dtmf *obj = &command->send_dtmf; + gboolean ret; + + if (command->src != STK_DEVICE_IDENTITY_TYPE_UICC) + return FALSE; + + if (command->dst != STK_DEVICE_IDENTITY_TYPE_NETWORK) + return FALSE; + + ret = parse_dataobj(iter, STK_DATA_OBJECT_TYPE_ALPHA_ID, 0, + &obj->alpha_id, + STK_DATA_OBJECT_TYPE_DTMF_STRING, + DATAOBJ_FLAG_MANDATORY | DATAOBJ_FLAG_MINIMUM, + &obj->dtmf, + STK_DATA_OBJECT_TYPE_ICON_ID, 0, + &obj->icon_id, + STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE, 0, + &obj->text_attr, + STK_DATA_OBJECT_TYPE_FRAME_ID, 0, + &obj->frame_id, + STK_DATA_OBJECT_TYPE_INVALID); + + if (ret == FALSE) + return FALSE; + + command->destructor = destroy_send_dtmf; + + return TRUE; +} + struct stk_command *stk_command_new_from_pdu(const unsigned char *pdu, unsigned int len) { @@ -2917,6 +2956,9 @@ struct stk_command *stk_command_new_from_pdu(const unsigned char *pdu, case STK_COMMAND_TYPE_RUN_AT_COMMAND: ok = parse_run_at_command(command, &iter); break; + case STK_COMMAND_TYPE_SEND_DTMF: + ok = parse_send_dtmf(command, &iter); + break; default: ok = FALSE; break; diff --git a/src/stkutil.h b/src/stkutil.h index 65a1c741..4828551f 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -980,6 +980,14 @@ struct stk_command_run_at_command { struct stk_frame_id frame_id; }; +struct stk_command_send_dtmf { + char *alpha_id; + char *dtmf; + struct stk_icon_id icon_id; + struct stk_text_attribute text_attr; + struct stk_frame_id frame_id; +}; + struct stk_command { unsigned char number; unsigned char type; @@ -1003,6 +1011,7 @@ struct stk_command { struct stk_command_timer_mgmt timer_mgmt; struct stk_command_setup_idle_mode_text setup_idle_mode_text; struct stk_command_run_at_command run_at_command; + struct stk_command_send_dtmf send_dtmf; }; void (*destructor)(struct stk_command *command);