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

Refactor: stk configuration capability parameters

This commit is contained in:
Denis Kenzior 2010-03-11 14:43:59 -06:00
parent e5dff20ff5
commit 44476dac9e
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/stkutil.c
View File

@ -121,24 +121,26 @@ static gboolean parse_dataobj_subaddress(struct comprehension_tlv_iter *iter,
} }
/* Defined in TS 102.223 Section 8.4 */ /* Defined in TS 102.223 Section 8.4 */
static gboolean parse_dataobj_capability_configuration_parameters( static gboolean parse_dataobj_ccp(struct comprehension_tlv_iter *iter,
struct comprehension_tlv_iter *iter, void *user) void *user)
{ {
struct stk_capability_configuration_parameters *ccp = user; struct stk_ccp *ccp = user;
const unsigned char *data; const unsigned char *data;
unsigned int len; unsigned int len;
if (comprehension_tlv_iter_get_tag(iter) != if (comprehension_tlv_iter_get_tag(iter) !=
STK_DATA_OBJECT_TYPE_CAPABILITY_CONFIGURATION_PARAMETERS) STK_DATA_OBJECT_TYPE_CCP)
return FALSE; return FALSE;
len = comprehension_tlv_iter_get_length(iter); len = comprehension_tlv_iter_get_length(iter);
if (len < 1) if (len < 1)
return FALSE; return FALSE;
if (len > sizeof(ccp->ccp))
return FALSE;
data = comprehension_tlv_iter_get_data(iter); data = comprehension_tlv_iter_get_data(iter);
ccp->ccp_len = len; ccp->len = len;
ccp->ccp = g_malloc(len);
memcpy(ccp->ccp, data, len); memcpy(ccp->ccp, data, len);
return TRUE; return TRUE;
@ -483,8 +485,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type)
return parse_dataobj_alpha_id; return parse_dataobj_alpha_id;
case STK_DATA_OBJECT_TYPE_SUBADDRESS: case STK_DATA_OBJECT_TYPE_SUBADDRESS:
return parse_dataobj_subaddress; return parse_dataobj_subaddress;
case STK_DATA_OBJECT_TYPE_CAPABILITY_CONFIGURATION_PARAMETERS: case STK_DATA_OBJECT_TYPE_CCP:
return parse_dataobj_capability_configuration_parameters; return parse_dataobj_ccp;
case STK_DATA_OBJECT_TYPE_DURATION: case STK_DATA_OBJECT_TYPE_DURATION:
return parse_dataobj_duration; return parse_dataobj_duration;
case STK_DATA_OBJECT_TYPE_ITEM: case STK_DATA_OBJECT_TYPE_ITEM:

20
src/stkutil.h
View File

@ -87,7 +87,7 @@ enum stk_data_object_type {
STK_DATA_OBJECT_TYPE_DURATION = 0x04, STK_DATA_OBJECT_TYPE_DURATION = 0x04,
STK_DATA_OBJECT_TYPE_ALPHA_ID = 0x05, STK_DATA_OBJECT_TYPE_ALPHA_ID = 0x05,
STK_DATA_OBJECT_TYPE_ADDRESS = 0x06, STK_DATA_OBJECT_TYPE_ADDRESS = 0x06,
STK_DATA_OBJECT_TYPE_CAPABILITY_CONFIGURATION_PARAMETERS = 0x07, STK_DATA_OBJECT_TYPE_CCP = 0x07,
STK_DATA_OBJECT_TYPE_SUBADDRESS = 0x08, STK_DATA_OBJECT_TYPE_SUBADDRESS = 0x08,
STK_DATA_OBJECT_TYPE_SS_STRING = 0x09, STK_DATA_OBJECT_TYPE_SS_STRING = 0x09,
STK_DATA_OBJECT_TYPE_USSD_STRING = 0x0A, STK_DATA_OBJECT_TYPE_USSD_STRING = 0x0A,
@ -217,10 +217,20 @@ struct stk_subaddress {
unsigned char *subaddr[23]; unsigned char *subaddr[23];
}; };
/* Defined in TS 102.223 Section 8.4 */ /*
struct stk_capability_configuration_parameters { * Defined in TS 102.223 Section 8.4
unsigned int ccp_len; *
unsigned char *ccp; * According to 24.008 Section 10.5.4.5 "The bearer capability is a type 4
* information element with a minimum length of 3 octets and a maximum length
* of 16 octets."
*
* According to TS 31.102 Section 4.2.38 the CCP length is 15 bytes.
*
* The CCP structure is not decoded, but stored as is from the CTLV
*/
struct stk_ccp {
unsigned char len;
unsigned char ccp[16];
}; };
/* /*