Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhongxiao
OpenXG-RAN
Commits
443ac98e
Commit
443ac98e
authored
Sep 11, 2023
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NSA with MIB
parent
221d4a78
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
28 deletions
+27
-28
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+12
-12
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+15
-16
No files found.
openair2/GNB_APP/gnb_config.c
View file @
443ac98e
...
...
@@ -1104,18 +1104,18 @@ static f1ap_setup_req_t *RC_read_F1Setup(uint64_t id,
req
->
cell
[
0
].
info
.
measurement_timing_information
=
"0"
;
i
f
(
get_softmodem_params
()
->
sa
)
{
// in NSA do not transmit sys_info
int
buf_len
=
3
;
// this is what we assume in monolithic
req
->
cell
[
0
].
sys_info
=
calloc
(
1
,
sizeof
(
*
req
->
cell
[
0
].
sys_info
))
;
AssertFatal
(
req
->
cell
[
0
].
sys_info
!=
NULL
,
"out of memory
\n
"
);
f1ap_gnb_du_system_info_t
*
sys_info
=
req
->
cell
[
0
].
sys_info
;
sys_info
->
mib
=
calloc
(
buf_len
,
sizeof
(
*
sys_info
->
mib
)
);
DevAssert
(
sys_info
->
mib
!=
NULL
);
DevAssert
(
mib
!=
NULL
);
sys_info
->
mib_length
=
encode_MIB_NR
(
mib
,
0
,
sys_info
->
mib
,
buf_len
);
DevAssert
(
sys_info
->
mib_length
==
buf_len
);
i
nt
buf_len
=
3
;
// this is what we assume in monolithic
req
->
cell
[
0
].
sys_info
=
calloc
(
1
,
sizeof
(
*
req
->
cell
[
0
].
sys_info
));
AssertFatal
(
req
->
cell
[
0
].
sys_info
!=
NULL
,
"out of memory
\n
"
);
f1ap_gnb_du_system_info_t
*
sys_info
=
req
->
cell
[
0
].
sys_info
;
sys_info
->
mib
=
calloc
(
buf_len
,
sizeof
(
*
sys_info
->
mib
)
);
DevAssert
(
sys_info
->
mib
!=
NULL
)
;
DevAssert
(
mib
!=
NULL
);
sys_info
->
mib_length
=
encode_MIB_NR
(
mib
,
0
,
sys_info
->
mib
,
buf_len
);
DevAssert
(
sys_info
->
mib_length
==
buf_len
);
if
(
get_softmodem_params
()
->
sa
)
{
// in NSA we don't transmit SIB1
DevAssert
(
sib1
!=
NULL
);
NR_SIB1_t
*
bcch_SIB1
=
sib1
->
message
.
choice
.
c1
->
choice
.
systemInformationBlockType1
;
sys_info
->
sib1
=
calloc
(
NR_MAX_SIB_LENGTH
/
8
,
sizeof
(
*
sys_info
->
sib1
));
...
...
openair2/RRC/NR/rrc_gNB.c
View file @
443ac98e
...
...
@@ -1792,28 +1792,27 @@ static void rrc_gNB_process_f1_setup_req(f1ap_setup_req_t *req, sctp_assoc_t ass
rrc
->
mac_rrc
.
f1_setup_failure
(
&
fail
);
return
;
}
// if there is no system information and we run in SA mode, we cannot handle it
if
(
req
->
cell
[
0
].
sys_info
==
NULL
&&
get_softmodem_params
()
->
sa
)
{
// if there is no system info or no SIB1 and we run in SA mode, we cannot handle it
const
f1ap_gnb_du_system_info_t
*
sys_info
=
req
->
cell
[
0
].
sys_info
;
if
(
sys_info
==
NULL
||
sys_info
->
mib
==
NULL
||
(
sys_info
->
sib1
==
NULL
&&
get_softmodem_params
()
->
sa
))
{
LOG_E
(
NR_RRC
,
"no system information provided by DU, rejecting
\n
"
);
rrc
->
mac_rrc
.
f1_setup_failure
(
&
fail
);
return
;
}
const
f1ap_gnb_du_system_info_t
*
sys_info
=
req
->
cell
[
0
].
sys_info
;
NR_SIB1_t
*
sib1
=
NULL
;
if
(
sys_info
)
{
/* do we need the MIB? for the moment, just check it is valid, then drop it */
NR_BCCH_BCH_Message_t
*
mib
=
NULL
;
asn_dec_rval_t
dec_rval
=
uper_decode_complete
(
NULL
,
&
asn_DEF_NR_BCCH_BCH_Message
,
(
void
**
)
&
mib
,
sys_info
->
mib
,
sys_info
->
mib_length
);
if
(
dec_rval
.
code
!=
RC_OK
)
{
LOG_E
(
RRC
,
"Failed to decode NR_BCCH_BCH_MESSAGE (%zu bits) of DU, rejecting DU
\n
"
,
dec_rval
.
consumed
);
rrc
->
mac_rrc
.
f1_setup_failure
(
&
fail
);
ASN_STRUCT_FREE
(
asn_DEF_NR_BCCH_BCH_Message
,
mib
);
return
;
}
ASN_STRUCT_FREE
(
asn_DEF_NR_BCCH_BCH_Message
,
mib
);
/* do we need the MIB? for the moment, just check it is valid, then drop it */
NR_BCCH_BCH_Message_t
*
mib
=
NULL
;
asn_dec_rval_t
dec_rval
=
uper_decode_complete
(
NULL
,
&
asn_DEF_NR_BCCH_BCH_Message
,
(
void
**
)
&
mib
,
sys_info
->
mib
,
sys_info
->
mib_length
);
ASN_STRUCT_FREE
(
asn_DEF_NR_BCCH_BCH_Message
,
mib
);
if
(
dec_rval
.
code
!=
RC_OK
)
{
LOG_E
(
RRC
,
"Failed to decode NR_BCCH_BCH_MESSAGE (%zu bits) of DU, rejecting DU
\n
"
,
dec_rval
.
consumed
);
rrc
->
mac_rrc
.
f1_setup_failure
(
&
fail
);
return
;
}
NR_SIB1_t
*
sib1
=
NULL
;
if
(
sys_info
->
sib1
)
{
dec_rval
=
uper_decode_complete
(
NULL
,
&
asn_DEF_NR_SIB1
,
(
void
**
)
&
sib1
,
sys_info
->
sib1
,
sys_info
->
sib1_length
);
if
(
dec_rval
.
code
!=
RC_OK
)
{
LOG_E
(
RRC
,
"Failed to decode NR_BCCH_DLSCH_MESSAGE (%zu bits) of DU, rejecting DU
\n
"
,
dec_rval
.
consumed
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment