maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/minor-ue-fixes' into integration_2024_w40b

Browse Source
This commit is contained in:
Jaroslava Fiedlerova
2024-10-07 16:40:09 +02:00
parent 169dddf8c0 8f46b07b22
commit dbd37dac38
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/NR_UE/rrc_UE.c
+6 -4
View File
@@ -551,14 +551,16 @@ static void nr_rrc_ue_decode_NR_BCCH_BCH_Message(NR_UE_RRC_INST_t *rrc,
} }
int get_sib = 0; int get_sib = 0;
if (get_softmodem_params()->sa && if (get_softmodem_params()->sa && bcch_message->message.present == NR_BCCH_BCH_MessageType_PR_mib
bcch_message->message.choice.mib->cellBarred == NR_MIB__cellBarred_notBarred && && bcch_message->message.choice.mib->cellBarred == NR_MIB__cellBarred_notBarred && rrc->nrRrcState != RRC_STATE_DETACH_NR) {
rrc->nrRrcState != RRC_STATE_DETACH_NR) {
NR_UE_RRC_SI_INFO *SI_info = &rrc->perNB[gNB_index].SInfo; NR_UE_RRC_SI_INFO *SI_info = &rrc->perNB[gNB_index].SInfo;
// to schedule MAC to get SI if required // to schedule MAC to get SI if required
get_sib = check_si_status(SI_info); get_sib = check_si_status(SI_info);
} }
nr_rrc_mac_config_req_mib(rrc->ue_id, 0, bcch_message->message.choice.mib, get_sib); if (bcch_message->message.present == NR_BCCH_BCH_MessageType_PR_mib)
nr_rrc_mac_config_req_mib(rrc->ue_id, 0, bcch_message->message.choice.mib, get_sib);
else
LOG_E(NR_RRC, "RRC-received BCCH message is not a MIB\n");
ASN_STRUCT_FREE(asn_DEF_NR_BCCH_BCH_Message, bcch_message); ASN_STRUCT_FREE(asn_DEF_NR_BCCH_BCH_Message, bcch_message);
return; return;
} }
openair2/UTIL/OPT/probe.c
+1 -1
View File
@@ -254,7 +254,7 @@ int opt_create_listener_socket(char *ip_address, uint16_t port) {
LOG_E(OPT, "Failed to bind socket to (%s:%u): %s\n", LOG_E(OPT, "Failed to bind socket to (%s:%u): %s\n",
inet_ntoa(opt_listener.address.sin_addr), inet_ntoa(opt_listener.address.sin_addr),
ntohs(opt_listener.address.sin_port), strerror(errno)); ntohs(opt_listener.address.sin_port), strerror(errno));
opt_type = OPT_NONE; // we log anyway as planned because other OAI process may have created the sink
close(opt_listener.sd); close(opt_listener.sd);
opt_listener.sd = -1; opt_listener.sd = -1;
return -1; return -1;