diff --git a/src/stkutil.c b/src/stkutil.c index d569f16b..0e0135f1 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -1273,6 +1273,32 @@ static gboolean parse_dataobj_display_parameters( return TRUE; } +/* Defined in TS 102.223 Section 8.63 */ +static gboolean parse_dataobj_service_record( + struct comprehension_tlv_iter *iter, void *user) +{ + struct stk_service_record *sr = user; + const unsigned char *data; + unsigned int len; + + len = comprehension_tlv_iter_get_length(iter); + if (len < 3) + return FALSE; + + data = comprehension_tlv_iter_get_data(iter); + sr->tech_id = data[0]; + sr->serv_id = data[1]; + sr->len = len - 2; + + sr->serv_rec = g_try_malloc(sr->len); + if (sr->serv_rec == NULL) + return FALSE; + + memcpy(sr->serv_rec, data + 2, sr->len); + + return TRUE; +} + /* Defined in TS 102.223 Section 8.72 */ static gboolean parse_dataobj_text_attr(struct comprehension_tlv_iter *iter, void *user) @@ -1427,6 +1453,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type) return parse_dataobj_access_technology; case STK_DATA_OBJECT_TYPE_DISPLAY_PARAMETERS: return parse_dataobj_display_parameters; + case STK_DATA_OBJECT_TYPE_SERVICE_RECORD: + return parse_dataobj_service_record; 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 3cf9caa6..581d9476 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -349,6 +349,14 @@ enum stk_access_technology_type { STK_ACCESS_TECHNOLOGY_EUTRAN = 0x08 }; +enum stk_technology_id { + STK_TECHNOLOGY_INDEPENDENT = 0x00, + STK_TECHNOLOGY_BLUETOOTH = 0x01, + STK_TECHNOLOGY_IRDA = 0x02, + STK_TECHNOLOGY_RS232 = 0x03, + STK_TECHNOLOGY_USB = 0x04 +}; + /* For data object that only has a byte array with undetermined length */ struct stk_common_byte_array { unsigned char *array; @@ -606,6 +614,14 @@ struct stk_display_parameters { unsigned char effects; }; +/* Defined in TS 102.223 Section 8.63 */ +struct stk_service_record { + unsigned char tech_id; + unsigned char serv_id; + unsigned char *serv_rec; + unsigned int len; +}; + /* * 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