diff --git a/src/stkutil.c b/src/stkutil.c index 7f3adaf8..3c792ff6 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -1186,6 +1186,27 @@ static gboolean parse_dataobj_card_reader_id( return TRUE; } +/* Defined in TS 102.223 Section 8.58 */ +static gboolean parse_dataobj_other_address( + struct comprehension_tlv_iter *iter, void *user) +{ + struct stk_other_address *oa = user; + const unsigned char *data; + unsigned char len = comprehension_tlv_iter_get_length(iter); + + if (len == 0) + return TRUE; + + if ((len != 5) && (len != 17)) + return FALSE; + + data = comprehension_tlv_iter_get_data(iter); + oa->type = data[0]; + memcpy(oa->addr, data + 1, len - 1); + + return TRUE; +} + /* Defined in TS 102.223 Section 8.72 */ static gboolean parse_dataobj_text_attr(struct comprehension_tlv_iter *iter, void *user) @@ -1330,6 +1351,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type) return parse_dataobj_channel_status; case STK_DATA_OBJECT_TYPE_CARD_READER_ID: return parse_dataobj_card_reader_id; + case STK_DATA_OBJECT_TYPE_OTHER_ADDRESS: + return parse_dataobj_other_address; case STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE: return parse_dataobj_text_attr; case STK_DATA_OBJECT_TYPE_FRAME_ID: diff --git a/src/stkutil.h b/src/stkutil.h index 511b912f..08110484 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -332,6 +332,11 @@ enum stk_bearer_type { STK_BEARER_TYPE_USB = 0x10 }; +enum stk_address_type { + STK_ADDRESS_IPV4 = 0x21, + STK_ADDRESS_IPV6 = 0x57 +}; + /* For data object that only has a byte array with undetermined length */ struct stk_common_byte_array { unsigned char *array; @@ -552,6 +557,15 @@ struct stk_card_reader_id { unsigned char len; }; +/* + * According to 102.223 Section 8.58 the address can be either ipv4 or ipv6. + * So the maximum size is 16 (for ipv6). + */ +struct stk_other_address { + unsigned char addr[16]; + unsigned char type; +}; + /* * According to 102.223 Section 8.72 the length of text attribute CTLV is 1 * byte. This means that the maximum size is 127 according to the rules