5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

liblte_mme: add DCNR UE capabilties packing

Browse Source
master
Andre Puschmann 6 years ago
parent 37fc1c59e3
commit c02aa8f124
2 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
lib/include/srslte/asn1/liblte_mme.h
Unescape Escape View File

@ -1340,6 +1340,8 @@ typedef struct {
bool onexsrvcc_present; bool onexsrvcc_present;
bool nf; bool nf;
bool nf_present; bool nf_present;
bool dc_nr;
bool dc_nr_present;
} LIBLTE_MME_UE_NETWORK_CAPABILITY_STRUCT; } LIBLTE_MME_UE_NETWORK_CAPABILITY_STRUCT;
// Functions // Functions
LIBLTE_ERROR_ENUM liblte_mme_pack_ue_network_capability_ie(LIBLTE_MME_UE_NETWORK_CAPABILITY_STRUCT* ue_network_cap, LIBLTE_ERROR_ENUM liblte_mme_pack_ue_network_capability_ie(LIBLTE_MME_UE_NETWORK_CAPABILITY_STRUCT* ue_network_cap,

44
lib/src/asn1/liblte_mme.cc
Unescape Escape View File

@ -2631,14 +2631,8 @@ LIBLTE_ERROR_ENUM liblte_mme_pack_ue_network_capability_ie(LIBLTE_MME_UE_NETWORK
LIBLTE_ERROR_ENUM err = LIBLTE_ERROR_INVALID_INPUTS; LIBLTE_ERROR_ENUM err = LIBLTE_ERROR_INVALID_INPUTS;
if (ue_network_cap != NULL && ie_ptr != NULL) { if (ue_network_cap != NULL && ie_ptr != NULL) {
if (ue_network_cap->uea_present && (ue_network_cap->ucs2_present || ue_network_cap->uia_present) && if (ue_network_cap->dc_nr_present) {
(ue_network_cap->lpp_present || ue_network_cap->lcs_present || ue_network_cap->onexsrvcc_present || **ie_ptr = 7;
ue_network_cap->nf_present)) {
**ie_ptr = 5;
} else if (ue_network_cap->uea_present && (ue_network_cap->ucs2_present || ue_network_cap->uia_present)) {
**ie_ptr = 4;
} else if (ue_network_cap->uea_present) {
**ie_ptr = 3;
} else { } else {
**ie_ptr = 2; **ie_ptr = 2;
} }
@ -2661,34 +2655,16 @@ LIBLTE_ERROR_ENUM liblte_mme_pack_ue_network_capability_ie(LIBLTE_MME_UE_NETWORK
**ie_ptr |= ue_network_cap->eia[6] << 1; **ie_ptr |= ue_network_cap->eia[6] << 1;
**ie_ptr |= ue_network_cap->eia[7]; **ie_ptr |= ue_network_cap->eia[7];
*ie_ptr += 1; *ie_ptr += 1;
if (ue_network_cap->uea_present) {
**ie_ptr = ue_network_cap->uea[0] << 7; if (ue_network_cap->dc_nr_present) {
**ie_ptr |= ue_network_cap->uea[1] << 6; // skip empty caps
**ie_ptr |= ue_network_cap->uea[2] << 5; for (int i = 0; i < 4; i++) {
**ie_ptr |= ue_network_cap->uea[3] << 4; **ie_ptr = 0;
**ie_ptr |= ue_network_cap->uea[4] << 3;
**ie_ptr |= ue_network_cap->uea[5] << 2;
**ie_ptr |= ue_network_cap->uea[6] << 1;
**ie_ptr |= ue_network_cap->uea[7];
*ie_ptr += 1;
}
if (ue_network_cap->ucs2_present || ue_network_cap->uia_present) {
**ie_ptr = ue_network_cap->ucs2 << 7;
**ie_ptr |= ue_network_cap->uia[1] << 6;
**ie_ptr |= ue_network_cap->uia[2] << 5;
**ie_ptr |= ue_network_cap->uia[3] << 4;
**ie_ptr |= ue_network_cap->uia[4] << 3;
**ie_ptr |= ue_network_cap->uia[5] << 2;
**ie_ptr |= ue_network_cap->uia[6] << 1;
**ie_ptr |= ue_network_cap->uia[7];
*ie_ptr += 1; *ie_ptr += 1;
} }
if (ue_network_cap->lpp_present || ue_network_cap->lcs_present || ue_network_cap->onexsrvcc_present ||
ue_network_cap->nf_present) { // set dcnr bit
**ie_ptr = ue_network_cap->lpp << 3; **ie_ptr = ue_network_cap->dc_nr << 4;
**ie_ptr |= ue_network_cap->lcs << 2;
**ie_ptr |= ue_network_cap->onexsrvcc << 1;
**ie_ptr |= ue_network_cap->nf;
*ie_ptr += 1; *ie_ptr += 1;
} }

Write Preview
Loading…
Cancel
Save