PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix s1ap packing issue

This commit is contained in:
Francisco Paisana 2020-02-26 17:10:39 +00:00
parent 052892916e
commit 56b0d0d3c3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/src/asn1/asn1_utils.cc
View File

@ -1090,12 +1090,15 @@ SRSASN_CODE pack_length_prefix(bit_ref& bref,
return SRSASN_SUCCESS;
}
SRSASN_CODE pack_bitfield(bit_ref& bref, const uint8_t* buf, uint32_t nbits)
SRSASN_CODE pack_bitfield(bit_ref& bref, const uint8_t* buf, uint32_t nbits, uint32_t lb, uint32_t ub, bool is_aligned)
{
if (nbits == 0) {
srsasn_log_print(LOG_LEVEL_ERROR, "Invalid bitstring size=%d\n", nbits);
return SRSASN_ERROR_ENCODE_FAIL;
}
if (is_aligned and (lb != ub or ub > 16)) {
bref.align_bytes();
}
uint32_t n_octs = ceil_frac(nbits, 8u);
uint32_t offset = ((nbits - 1) % 8) + 1;
HANDLE_CODE(bref.pack(buf[n_octs - 1], offset));
@ -1112,7 +1115,7 @@ SRSASN_CODE
pack(bit_ref& bref, const uint8_t* data, uint32_t len, uint32_t lb, uint32_t ub, bool has_ext, bool is_aligned)
{
HANDLE_CODE(bitstring_utils::pack_length_prefix(bref, len, lb, ub, has_ext, is_aligned));
return pack_bitfield(bref, data, len);
return pack_bitfield(bref, data, len, lb, ub, is_aligned);
}
// Unpack prefix, excluding ext bit