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

Add Simple TLV iterator utilities

This commit is contained in:
Denis Kenzior 2010-02-23 11:22:06 -06:00
parent 0db0108120
commit d98be70fa9
2 changed files with 105 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/simutil.c
View File

@ -117,6 +117,87 @@ static struct sim_ef_info ef_db[] = {
{ 0x6FE3, 0x0000, BINARY, 18, PIN, PIN },
};
void simple_tlv_iter_init(struct simple_tlv_iter *iter,
const unsigned char *pdu, unsigned int len)
{
iter->pdu = pdu;
iter->max = len;
iter->pos = 0;
iter->tag = 0;
iter->len = 0;
iter->data = NULL;
}
gboolean simple_tlv_iter_next(struct simple_tlv_iter *iter)
{
const unsigned char *pdu = iter->pdu + iter->pos;
const unsigned char *end = iter->pdu + iter->max;
unsigned char tag;
unsigned short len;
if (pdu == end)
return FALSE;
tag = *pdu;
pdu++;
/*
* ISO 7816-4, Section 5.2.1:
*
* The tag field consists of a single byte encoding a tag number from
* 1 to 254. The values 00 and FF are invalid for tag fields.
*
* The length field consists of one or three consecutive bytes.
* - If the first byte is not set to FF, then the length field
* consists of a single byte encoding a number from zero to
* 254 and denoted N.
* - If the first byte is set to FF, then the length field
* continues on the subsequent two bytes with any value
* encoding a number from zero to 65535 and denoted N
*
* If N is zero, there is no value field, i.e. data object is empty.
*/
if (pdu == end)
return FALSE;
len = *pdu++;
if (len == 0xFF) {
if ((pdu + 2) > end)
return FALSE;
len = (pdu[0] << 8) | pdu[1];
pdu += 2;
}
if (pdu + len > end)
return FALSE;
iter->tag = tag;
iter->len = len;
iter->data = pdu;
iter->pos = pdu + len - iter->pdu;
return TRUE;
}
unsigned char simple_tlv_iter_get_tag(struct simple_tlv_iter *iter)
{
return iter->tag;
}
unsigned short simple_tlv_iter_get_length(struct simple_tlv_iter *iter)
{
return iter->len;
}
const unsigned char *simple_tlv_iter_get_data(struct simple_tlv_iter *iter)
{
return iter->data;
}
void ber_tlv_iter_init(struct ber_tlv_iter *iter, const unsigned char *pdu,
unsigned int len)
{
@ -264,6 +345,12 @@ void ber_tlv_iter_recurse(struct ber_tlv_iter *iter,
recurse->pos = 0;
}
void ber_tlv_iter_recurse_simple(struct ber_tlv_iter *iter,
struct simple_tlv_iter *container)
{
simple_tlv_iter_init(container, iter->data, iter->len);
}
static const guint8 *ber_tlv_find_by_tag(const guint8 *pdu, guint8 in_tag,
int in_len, int *out_len)
{

18
src/simutil.h
View File

@ -84,6 +84,15 @@ struct sim_ef_info {
enum sim_file_access perm_update;
};
struct simple_tlv_iter {
unsigned int max;
unsigned int pos;
const unsigned char *pdu;
unsigned char tag;
unsigned short len;
const unsigned char *data;
};
struct ber_tlv_iter {
unsigned int max;
unsigned int pos;
@ -95,6 +104,13 @@ struct ber_tlv_iter {
const unsigned char *data;
};
void simple_tlv_iter_init(struct simple_tlv_iter *iter,
const unsigned char *pdu, unsigned int len);
gboolean simple_tlv_iter_next(struct simple_tlv_iter *iter);
unsigned char simple_tlv_iter_get_tag(struct simple_tlv_iter *iter);
unsigned short simple_tlv_iter_get_length(struct simple_tlv_iter *iter);
const unsigned char *simple_tlv_iter_get_data(struct simple_tlv_iter *iter);
void ber_tlv_iter_init(struct ber_tlv_iter *iter, const unsigned char *pdu,
unsigned int len);
/*
@ -122,6 +138,8 @@ const unsigned char *ber_tlv_iter_get_data(struct ber_tlv_iter *iter);
gboolean ber_tlv_iter_next(struct ber_tlv_iter *iter);
void ber_tlv_iter_recurse(struct ber_tlv_iter *iter,
struct ber_tlv_iter *recurse);
void ber_tlv_iter_recurse_simple(struct ber_tlv_iter *iter,
struct simple_tlv_iter *container);
struct sim_eons *sim_eons_new(int pnn_records);
void sim_eons_add_pnn_record(struct sim_eons *eons, int record,