sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Add support for GET INKEY proactive command

This commit is contained in:
Denis Kenzior 2010-03-01 17:27:38 -06:00
parent f4f6284f26
commit 54ac375066
2 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/stkutil.c
View File

@ -136,6 +136,11 @@ static void destroy_display_text(struct stk_command *command)
g_free(command->display_text.text); g_free(command->display_text.text);
} }
static void destroy_get_inkey(struct stk_command *command)
{
g_free(command->get_inkey.text);
}
/* Defined in TS 102.223 Section 8.31 */ /* Defined in TS 102.223 Section 8.31 */
static gboolean parse_dataobj_icon_id(struct comprehension_tlv_iter *iter, static gboolean parse_dataobj_icon_id(struct comprehension_tlv_iter *iter,
void *user) void *user)
@ -311,23 +316,24 @@ static gboolean parse_dataobj(struct comprehension_tlv_iter *iter,
static gboolean parse_display_text(struct stk_command *command, static gboolean parse_display_text(struct stk_command *command,
struct comprehension_tlv_iter *iter) struct comprehension_tlv_iter *iter)
{ {
struct stk_command_display_text *obj = &command->display_text;
gboolean ret; gboolean ret;
command->display_text.frame_id = 0xFF; obj->frame_id = 0xFF;
ret = parse_dataobj(iter, STK_DATA_OBJECT_TYPE_TEXT, ret = parse_dataobj(iter, STK_DATA_OBJECT_TYPE_TEXT,
DATAOBJ_FLAG_MANDATORY | DATAOBJ_FLAG_MINIMUM, DATAOBJ_FLAG_MANDATORY | DATAOBJ_FLAG_MINIMUM,
&command->display_text.text, &obj->text,
STK_DATA_OBJECT_TYPE_ICON_ID, 0, STK_DATA_OBJECT_TYPE_ICON_ID, 0,
&command->display_text.icon_id, &obj->icon_id,
STK_DATA_OBJECT_TYPE_IMMEDIATE_RESPONSE, 0, STK_DATA_OBJECT_TYPE_IMMEDIATE_RESPONSE, 0,
&command->display_text.immediate_response, &obj->immediate_response,
STK_DATA_OBJECT_TYPE_DURATION, 0, STK_DATA_OBJECT_TYPE_DURATION, 0,
&command->display_text.duration, &obj->duration,
STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE, 0, STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE, 0,
&command->display_text.text_attribute, &obj->text_attribute,
STK_DATA_OBJECT_TYPE_FRAME_ID, 0, STK_DATA_OBJECT_TYPE_FRAME_ID, 0,
&command->display_text.frame_id, &obj->frame_id,
STK_DATA_OBJECT_TYPE_INVALID); STK_DATA_OBJECT_TYPE_INVALID);
if (ret == FALSE) if (ret == FALSE)
@ -338,6 +344,37 @@ static gboolean parse_display_text(struct stk_command *command,
return TRUE; return TRUE;
} }
static gboolean parse_get_inkey(struct stk_command *command,
struct comprehension_tlv_iter *iter)
{
struct stk_command_display_text *obj = &command->get_inkey;
gboolean ret;
obj->frame_id = 0xFF;
ret = parse_dataobj(iter, STK_DATA_OBJECT_TYPE_TEXT,
DATAOBJ_FLAG_MANDATORY | DATAOBJ_FLAG_MINIMUM,
&obj->text,
STK_DATA_OBJECT_TYPE_ICON_ID, 0,
&obj->icon_id,
STK_DATA_OBJECT_TYPE_IMMEDIATE_RESPONSE, 0,
&obj->immediate_response,
STK_DATA_OBJECT_TYPE_DURATION, 0,
&obj->duration,
STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE, 0,
&obj->text_attribute,
STK_DATA_OBJECT_TYPE_FRAME_ID, 0,
&obj->frame_id,
STK_DATA_OBJECT_TYPE_INVALID);
if (ret == FALSE)
return FALSE;
command->destructor = destroy_get_inkey;
return TRUE;
}
struct stk_command *stk_command_new_from_pdu(const unsigned char *pdu, struct stk_command *stk_command_new_from_pdu(const unsigned char *pdu,
unsigned int len) unsigned int len)
{ {
@ -402,6 +439,9 @@ struct stk_command *stk_command_new_from_pdu(const unsigned char *pdu,
case STK_COMMAND_TYPE_DISPLAY_TEXT: case STK_COMMAND_TYPE_DISPLAY_TEXT:
ok = parse_display_text(command, &iter); ok = parse_display_text(command, &iter);
break; break;
case STK_COMMAND_TYPE_GET_INKEY:
ok = parse_get_inkey(command, &iter);
break;
default: default:
ok = FALSE; ok = FALSE;
break; break;

1
src/stkutil.h
View File

@ -238,6 +238,7 @@ struct stk_command {
union { union {
struct stk_command_display_text display_text; struct stk_command_display_text display_text;
struct stk_command_display_text get_inkey;
}; };
void (*destructor)(struct stk_command *command); void (*destructor)(struct stk_command *command);