Add support for Get Input proactive command

diff --git a/src/stkutil.c b/src/stkutil.c
index 1207a5f..39eb54a 100644 (file)
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -408,6 +408,43 @@ static gboolean parse_get_inkey(struct stk_command *command,
        return TRUE;
 }
 
+static void destroy_get_input(struct stk_command *command)
+{
+       g_free(command->get_input.text);
+}
+
+static gboolean parse_get_input(struct stk_command *command,
+                                       struct comprehension_tlv_iter *iter)
+{
+       struct stk_command_get_input *obj = &command->get_input;
+       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_RESPONSE_LENGTH,
+                               DATAOBJ_FLAG_MANDATORY | DATAOBJ_FLAG_MINIMUM,
+                               &obj->response_length,
+                               STK_DATA_OBJECT_TYPE_DEFAULT_TEXT, 0,
+                               &obj->default_text,
+                               STK_DATA_OBJECT_TYPE_ICON_ID, 0,
+                               &obj->icon_id,
+                               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_input;
+
+       return TRUE;
+}
+
 struct stk_command *stk_command_new_from_pdu(const unsigned char *pdu,
                                                unsigned int len)
 {
@@ -475,6 +512,9 @@ struct stk_command *stk_command_new_from_pdu(const unsigned char *pdu,
        case STK_COMMAND_TYPE_GET_INKEY:
                ok = parse_get_inkey(command, &iter);
                break;
+       case STK_COMMAND_TYPE_GET_INPUT:
+               ok = parse_get_input(command, &iter);
+               break;
        default:
                ok = FALSE;
                break;

diff --git a/src/stkutil.h b/src/stkutil.h
index f950ea5..a319141 100644 (file)
--- a/src/stkutil.h
+++ b/src/stkutil.h
@@ -238,6 +238,15 @@ struct stk_command_display_text {
        unsigned char frame_id; /* Values 0x10 to 0xFF reserved */
 };
 
+struct stk_command_get_input {
+       char *text;
+       struct stk_response_length response_length;
+       char *default_text;
+       struct stk_icon_identifier icon_id;
+       struct stk_text_attribute text_attribute;
+       unsigned char frame_id; /* Values 0x10 to 0xFF reserved */
+};
+
 struct stk_command {
        unsigned char number;
        unsigned char type;
@@ -248,6 +257,7 @@ struct stk_command {
        union {
                struct stk_command_display_text display_text;
                struct stk_command_display_text get_inkey;
+               struct stk_command_get_input get_input;
        };
 
        void (*destructor)(struct stk_command *command);