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
wangjie
OpenXG-RAN
Commits
18da7558
Commit
18da7558
authored
Jun 11, 2021
by
hardy
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into test-5GREC
parents
faec03cb
1c0640a2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
38 deletions
+43
-38
openair2/RRC/NR/rrc_gNB_nsa.c
openair2/RRC/NR/rrc_gNB_nsa.c
+6
-6
openair2/RRC/NR/rrc_gNB_reconfig.c
openair2/RRC/NR/rrc_gNB_reconfig.c
+37
-32
No files found.
openair2/RRC/NR/rrc_gNB_nsa.c
View file @
18da7558
...
@@ -377,7 +377,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
...
@@ -377,7 +377,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
nr_rrc_pdcp_config_asn1_req
(
nr_rrc_pdcp_config_asn1_req
(
&
ctxt
,
&
ctxt
,
ue_context_p
->
ue_context
.
rb_config
->
srb_ToAddModList
,
(
NR_SRB_ToAddModList_t
*
)
NULL
,
ue_context_p
->
ue_context
.
rb_config
->
drb_ToAddModList
,
ue_context_p
->
ue_context
.
rb_config
->
drb_ToAddModList
,
ue_context_p
->
ue_context
.
rb_config
->
drb_ToReleaseList
,
ue_context_p
->
ue_context
.
rb_config
->
drb_ToReleaseList
,
(
ue_context_p
->
ue_context
.
integrity_algorithm
<<
4
)
|
ue_context_p
->
ue_context
.
ciphering_algorithm
,
(
ue_context_p
->
ue_context
.
integrity_algorithm
<<
4
)
|
ue_context_p
->
ue_context
.
ciphering_algorithm
,
...
@@ -390,7 +390,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
...
@@ -390,7 +390,7 @@ void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_
ue_context_p
->
ue_context
.
secondaryCellGroup
->
rlc_BearerToAddModList
);
ue_context_p
->
ue_context
.
secondaryCellGroup
->
rlc_BearerToAddModList
);
nr_rrc_rlc_config_asn1_req
(
&
ctxt
,
nr_rrc_rlc_config_asn1_req
(
&
ctxt
,
ue_context_p
->
ue_context
.
rb_config
->
srb_ToAddModList
,
(
NR_SRB_ToAddModList_t
*
)
NULL
,
ue_context_p
->
ue_context
.
rb_config
->
drb_ToAddModList
,
ue_context_p
->
ue_context
.
rb_config
->
drb_ToAddModList
,
ue_context_p
->
ue_context
.
rb_config
->
drb_ToReleaseList
,
ue_context_p
->
ue_context
.
rb_config
->
drb_ToReleaseList
,
(
LTE_PMCH_InfoList_r9_t
*
)
NULL
,
(
LTE_PMCH_InfoList_r9_t
*
)
NULL
,
...
...
openair2/RRC/NR/rrc_gNB_reconfig.c
View file @
18da7558
...
@@ -164,6 +164,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
...
@@ -164,6 +164,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
secondaryCellGroup
->
rlc_BearerToAddModList
=
calloc
(
1
,
sizeof
(
*
secondaryCellGroup
->
rlc_BearerToAddModList
));
secondaryCellGroup
->
rlc_BearerToAddModList
=
calloc
(
1
,
sizeof
(
*
secondaryCellGroup
->
rlc_BearerToAddModList
));
ASN_SEQUENCE_ADD
(
&
secondaryCellGroup
->
rlc_BearerToAddModList
->
list
,
RLC_BearerConfig
);
ASN_SEQUENCE_ADD
(
&
secondaryCellGroup
->
rlc_BearerToAddModList
->
list
,
RLC_BearerConfig
);
if
(
0
)
{
NR_RLC_BearerConfig_t
*
RLC_BearerConfig_srb1
=
calloc
(
1
,
sizeof
(
*
RLC_BearerConfig_srb1
));
NR_RLC_BearerConfig_t
*
RLC_BearerConfig_srb1
=
calloc
(
1
,
sizeof
(
*
RLC_BearerConfig_srb1
));
nr_rlc_bearer_init
(
RLC_BearerConfig_srb1
,
NR_RLC_BearerConfig__servedRadioBearer_PR_srb_Identity
);
nr_rlc_bearer_init
(
RLC_BearerConfig_srb1
,
NR_RLC_BearerConfig__servedRadioBearer_PR_srb_Identity
);
nr_drb_config
(
RLC_BearerConfig_srb1
->
rlc_Config
,
NR_RLC_Config_PR_am
);
nr_drb_config
(
RLC_BearerConfig_srb1
->
rlc_Config
,
NR_RLC_Config_PR_am
);
...
@@ -181,6 +182,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
...
@@ -181,6 +182,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
RLC_BearerConfig_srb2
->
logicalChannelIdentity
=
2
;
RLC_BearerConfig_srb2
->
logicalChannelIdentity
=
2
;
RLC_BearerConfig_srb2
->
servedRadioBearer
->
choice
.
srb_Identity
=
2
;
RLC_BearerConfig_srb2
->
servedRadioBearer
->
choice
.
srb_Identity
=
2
;
ASN_SEQUENCE_ADD
(
&
secondaryCellGroup
->
rlc_BearerToAddModList
->
list
,
RLC_BearerConfig_srb2
);
ASN_SEQUENCE_ADD
(
&
secondaryCellGroup
->
rlc_BearerToAddModList
->
list
,
RLC_BearerConfig_srb2
);
}
secondaryCellGroup
->
mac_CellGroupConfig
=
calloc
(
1
,
sizeof
(
*
secondaryCellGroup
->
mac_CellGroupConfig
));
secondaryCellGroup
->
mac_CellGroupConfig
=
calloc
(
1
,
sizeof
(
*
secondaryCellGroup
->
mac_CellGroupConfig
));
secondaryCellGroup
->
mac_CellGroupConfig
->
drx_Config
=
NULL
;
secondaryCellGroup
->
mac_CellGroupConfig
->
drx_Config
=
NULL
;
...
@@ -1275,8 +1277,10 @@ void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig,
...
@@ -1275,8 +1277,10 @@ void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig,
e_NR_CipheringAlgorithm
ciphering_algorithm
,
e_NR_CipheringAlgorithm
ciphering_algorithm
,
e_NR_SecurityConfig__keyToUse
key_to_use
)
{
e_NR_SecurityConfig__keyToUse
key_to_use
)
{
rbconfig
->
srb_ToAddModList
=
calloc
(
1
,
sizeof
(
*
rbconfig
->
srb_ToAddModList
))
;
rbconfig
->
srb_ToAddModList
=
NULL
;
if
(
0
)
{
rbconfig
->
srb_ToAddModList
=
calloc
(
1
,
sizeof
(
*
rbconfig
->
srb_ToAddModList
));
NR_SRB_ToAddMod_t
*
srb1_ToAddMod
=
calloc
(
1
,
sizeof
(
*
srb1_ToAddMod
));
NR_SRB_ToAddMod_t
*
srb1_ToAddMod
=
calloc
(
1
,
sizeof
(
*
srb1_ToAddMod
));
srb1_ToAddMod
->
srb_Identity
=
1
;
srb1_ToAddMod
->
srb_Identity
=
1
;
srb1_ToAddMod
->
reestablishPDCP
=
NULL
;
srb1_ToAddMod
->
reestablishPDCP
=
NULL
;
...
@@ -1290,6 +1294,7 @@ void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig,
...
@@ -1290,6 +1294,7 @@ void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig,
srb2_ToAddMod
->
discardOnPDCP
=
NULL
;
srb2_ToAddMod
->
discardOnPDCP
=
NULL
;
srb2_ToAddMod
->
pdcp_Config
=
NULL
;
srb2_ToAddMod
->
pdcp_Config
=
NULL
;
ASN_SEQUENCE_ADD
(
&
rbconfig
->
srb_ToAddModList
->
list
,
srb2_ToAddMod
);
ASN_SEQUENCE_ADD
(
&
rbconfig
->
srb_ToAddModList
->
list
,
srb2_ToAddMod
);
}
rbconfig
->
srb3_ToRelease
=
NULL
;
rbconfig
->
srb3_ToRelease
=
NULL
;
rbconfig
->
drb_ToAddModList
=
calloc
(
1
,
sizeof
(
*
rbconfig
->
drb_ToAddModList
));
rbconfig
->
drb_ToAddModList
=
calloc
(
1
,
sizeof
(
*
rbconfig
->
drb_ToAddModList
));
...
...
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