cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

move osmo_shift_* / osmo_match_shift_* to libosmogsm

This commit is contained in:
Harald Welte 2016-04-25 15:20:51 +02:00
parent 842674b8b3
commit 85234a32db
3 changed files with 0 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openbsc/include/openbsc/gprs_utils.h
View File

@ -42,15 +42,4 @@ int gprs_is_mi_imsi(const uint8_t *value, size_t value_len);
int gprs_parse_mi_tmsi(const uint8_t *value, size_t value_len, uint32_t *tmsi);
void gprs_parse_tmsi(const uint8_t *value, uint32_t *tmsi);
int osmo_shift_v_fixed(uint8_t **data, size_t *data_len,
size_t len, uint8_t **value);
int osmo_match_shift_tv_fixed(uint8_t **data, size_t *data_len,
uint8_t tag, size_t len, uint8_t **value);
int osmo_shift_tlv(uint8_t **data, size_t *data_len,
uint8_t *tag, uint8_t **value, size_t *value_len);
int osmo_match_shift_tlv(uint8_t **data, size_t *data_len,
uint8_t tag, uint8_t **value, size_t *value_len);
int osmo_shift_lv(uint8_t **data, size_t *data_len,
uint8_t **value, size_t *value_len);
int gprs_ra_id_equals(const struct gprs_ra_id *id1, const struct gprs_ra_id *id2);

173
openbsc/src/gprs/gprs_utils.c
View File

@ -266,179 +266,6 @@ void gprs_parse_tmsi(const uint8_t *value, uint32_t *tmsi)
*tmsi = ntohl(tmsi_be);
}
/* TODO: Move shift functions to libosmocore */
/*! Advance the data pointer, subtract length and assign value pointer
* \param data pointer to the pointer to data
* \param data_len pointer to size_t containing \arg data length
* \param[in] len the length that we expect the fixed IE to hav
* \param[out] value pointer to pointer of value part of IE
* \returns length of IE value; negative in case of error
*/
int osmo_shift_v_fixed(uint8_t **data, size_t *data_len,
size_t len, uint8_t **value)
{
if (len > *data_len)
goto fail;
if (value)
*value = *data;
*data += len;
*data_len -= len;
return len;
fail:
*data += *data_len;
*data_len = 0;
return -1;
}
/*! Match tag, check length and assign value pointer
* \param data pointer to the pointer to data
* \param data_len pointer to size_t containing \arg data length
* \param[in] tag the tag (IEI) that we expect at \arg data
* \param[in] len the length that we expect the fixed IE to have
* \param[out] value pointer to pointer of value part of IE
* \returns length of IE value; negative in case of error
*/
int osmo_match_shift_tv_fixed(uint8_t **data, size_t *data_len,
uint8_t tag, size_t len,
uint8_t **value)
{
size_t ie_len;
if (*data_len == 0)
goto fail;
if ((*data)[0] != tag)
return 0;
if (len > *data_len - 1)
goto fail;
if (value)
*value = *data + 1;
ie_len = len + 1;
*data += ie_len;
*data_len -= ie_len;
return ie_len;
fail:
*data += *data_len;
*data_len = 0;
return -1;
}
/*! Verify TLV header and advance data / subtract length
* \param data pointer to the pointer to data
* \param data_len pointer to size_t containing \arg data length
* \param[in] expected_tag the tag (IEI) that we expect at \arg data
* \param[out] value pointer to pointer of value part of IE
* \param[out] value_len pointer to length of \arg value
* \returns length of IE value; negative in case of error
*/
int osmo_match_shift_tlv(uint8_t **data, size_t *data_len,
uint8_t expected_tag, uint8_t **value,
size_t *value_len)
{
int rc;
uint8_t tag;
uint8_t *old_data = *data;
size_t old_data_len = *data_len;
rc = osmo_shift_tlv(data, data_len, &tag, value, value_len);
if (rc > 0 && tag != expected_tag) {
*data = old_data;
*data_len = old_data_len;
return 0;
}
return rc;
}
/*! Extract TLV and advance data pointer + subtract length
* \param data pointer to the pointer to data
* \param data_len pointer to size_t containing \arg data lengt
* \param[out] tag extract the tag (IEI) at start of \arg data
* \param[out] value extracted pointer to value part of TLV
* \param[out] value_len extracted length of \arg value
* \returns number of bytes subtracted
*/
int osmo_shift_tlv(uint8_t **data, size_t *data_len,
uint8_t *tag, uint8_t **value, size_t *value_len)
{
size_t len;
size_t ie_len;
if (*data_len < 2)
goto fail;
len = (*data)[1];
if (len > *data_len - 2)
goto fail;
if (tag)
*tag = (*data)[0];
if (value)
*value = *data + 2;
if (value_len)
*value_len = len;
ie_len = len + 2;
*data += ie_len;
*data_len -= ie_len;
return ie_len;
fail:
*data += *data_len;
*data_len = 0;
return -1;
}
/*! Extract LV and advance data pointer + subtract length
* \param data pointer to the pointer to data
* \param data_len pointer to size_t containing \arg data lengt
* \param[out] value extracted pointer to value part of TLV
* \param[out] value_len extracted length of \arg value
* \returns number of bytes subtracted
*/
int osmo_shift_lv(uint8_t **data, size_t *data_len,
uint8_t **value, size_t *value_len)
{
size_t len;
size_t ie_len;
if (*data_len < 1)
goto fail;
len = (*data)[0];
if (len > *data_len - 1)
goto fail;
if (value)
*value = *data + 1;
if (value_len)
*value_len = len;
ie_len = len + 1;
*data += ie_len;
*data_len -= ie_len;
return ie_len;
fail:
*data += *data_len;
*data_len = 0;
return -1;
}
int gprs_ra_id_equals(const struct gprs_ra_id *id1,
const struct gprs_ra_id *id2)
{

1
openbsc/src/gprs/osmo_gsup_messages.c
View File

@ -26,7 +26,6 @@
#include <openbsc/osmo_gsup_messages.h>
#include <openbsc/debug.h>
#include <openbsc/gprs_utils.h>
#include <openbsc/utils.h>
#include <osmocom/gsm/tlv.h>