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
zzha zzha
OpenXG-RAN
Commits
82e323ee
Commit
82e323ee
authored
Jan 05, 2024
by
francescomani
Committed by
Jaroslava Fiedlerova
Jan 19, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
using instance to identify PDCP at UE
parent
1b9f6745
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
46 deletions
+46
-46
executables/nr-ue.c
executables/nr-ue.c
+1
-1
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+9
-9
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+25
-35
openair2/RRC/NR_UE/rrc_defs.h
openair2/RRC/NR_UE/rrc_defs.h
+2
-0
openair2/SDAP/nr_sdap/nr_sdap_entity.c
openair2/SDAP/nr_sdap/nr_sdap_entity.c
+9
-1
No files found.
executables/nr-ue.c
View file @
82e323ee
...
...
@@ -1001,7 +1001,7 @@ void init_NR_UE(int nb_inst, char *uecap_file, char *reconfig_file, char *rbconf
// set up PDCP, RLC, MAC
nr_pdcp_layer_init
(
false
);
nr_pdcp_add_drbs
(
ENB_FLAG_NO
,
mac_inst
->
crnti
,
rbconfig
->
drb_ToAddModList
,
0
,
NULL
,
NULL
);
nr_pdcp_add_drbs
(
ENB_FLAG_NO
,
inst
,
rbconfig
->
drb_ToAddModList
,
0
,
NULL
,
NULL
);
nr_rlc_add_drb
(
mac_inst
->
crnti
,
rbconfig
->
drb_ToAddModList
->
list
.
array
[
0
]
->
drb_Identity
,
rlc_rbconfig
);
struct
NR_CellGroupConfig__rlc_BearerToAddModList
rlc_toadd_list
;
rlc_toadd_list
.
list
.
count
=
1
;
...
...
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
View file @
82e323ee
...
...
@@ -765,7 +765,7 @@ void deliver_pdu_srb_rlc(void *deliver_pdu_data, ue_id_t ue_id, int srb_id,
}
void
add_srb
(
int
is_gnb
,
ue_id_t
rntiMaybe
UEid
,
ue_id_t
UEid
,
struct
NR_SRB_ToAddMod
*
s
,
int
ciphering_algorithm
,
int
integrity_algorithm
,
...
...
@@ -781,9 +781,9 @@ void add_srb(int is_gnb,
t_Reordering
=
decode_t_reordering
(
*
s
->
pdcp_Config
->
t_Reordering
);
nr_pdcp_manager_lock
(
nr_pdcp_ue_manager
);
ue
=
nr_pdcp_manager_get_ue
(
nr_pdcp_ue_manager
,
rntiMaybe
UEid
);
ue
=
nr_pdcp_manager_get_ue
(
nr_pdcp_ue_manager
,
UEid
);
if
(
nr_pdcp_get_rb
(
ue
,
srb_id
,
true
)
!=
NULL
)
{
LOG_E
(
PDCP
,
"warning SRB %d already exist for UE ID
/RNTI %ld, do nothing
\n
"
,
srb_id
,
rntiMaybe
UEid
);
LOG_E
(
PDCP
,
"warning SRB %d already exist for UE ID
%ld, do nothing
\n
"
,
srb_id
,
UEid
);
}
else
{
pdcp_srb
=
new_nr_pdcp_entity
(
NR_PDCP_SRB
,
is_gnb
,
srb_id
,
0
,
false
,
false
,
// sdap parameters
...
...
@@ -795,13 +795,13 @@ void add_srb(int is_gnb,
integrity_key
);
nr_pdcp_ue_add_srb_pdcp_entity
(
ue
,
srb_id
,
pdcp_srb
);
LOG_D
(
PDCP
,
"
%s:%d:%s: added srb %d to UE ID/RNTI %ld
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
,
srb_id
,
rntiMaybe
UEid
);
LOG_D
(
PDCP
,
"
added srb %d to UE ID %ld
\n
"
,
srb_id
,
UEid
);
}
nr_pdcp_manager_unlock
(
nr_pdcp_ue_manager
);
}
void
add_drb
(
int
is_gnb
,
ue_id_t
rntiMaybe
UEid
,
ue_id_t
UEid
,
struct
NR_DRB_ToAddMod
*
s
,
int
ciphering_algorithm
,
int
integrity_algorithm
,
...
...
@@ -877,9 +877,9 @@ void add_drb(int is_gnb,
nr_pdcp_manager_lock
(
nr_pdcp_ue_manager
);
ue
=
nr_pdcp_manager_get_ue
(
nr_pdcp_ue_manager
,
rntiMaybe
UEid
);
ue
=
nr_pdcp_manager_get_ue
(
nr_pdcp_ue_manager
,
UEid
);
if
(
nr_pdcp_get_rb
(
ue
,
drb_id
,
false
)
!=
NULL
)
{
LOG_W
(
PDCP
,
"warning DRB %d already exist for UE ID
/RNTI %ld, do nothing
\n
"
,
drb_id
,
rntiMaybe
UEid
);
LOG_W
(
PDCP
,
"warning DRB %d already exist for UE ID
%ld, do nothing
\n
"
,
drb_id
,
UEid
);
}
else
{
pdcp_drb
=
new_nr_pdcp_entity
(
NR_PDCP_DRB_AM
,
is_gnb
,
drb_id
,
pdusession_id
,
has_sdap_rx
,
has_sdap_tx
,
deliver_sdu_drb
,
ue
,
...
...
@@ -893,9 +893,9 @@ void add_drb(int is_gnb,
has_integrity
?
integrity_key
:
NULL
);
nr_pdcp_ue_add_drb_pdcp_entity
(
ue
,
drb_id
,
pdcp_drb
);
LOG_D
(
PDCP
,
"
%s:%d:%s: added drb %d to UE ID/RNTI %ld
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
,
drb_id
,
rntiMaybe
UEid
);
LOG_D
(
PDCP
,
"
added drb %d to UE ID %ld
\n
"
,
drb_id
,
UEid
);
new_nr_sdap_entity
(
is_gnb
,
has_sdap_rx
,
has_sdap_tx
,
rntiMaybe
UEid
,
pdusession_id
,
is_sdap_DefaultDRB
,
drb_id
,
mappedQFIs2Add
,
mappedQFIs2AddCount
);
new_nr_sdap_entity
(
is_gnb
,
has_sdap_rx
,
has_sdap_tx
,
UEid
,
pdusession_id
,
is_sdap_DefaultDRB
,
drb_id
,
mappedQFIs2Add
,
mappedQFIs2AddCount
);
}
nr_pdcp_manager_unlock
(
nr_pdcp_ue_manager
);
}
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
82e323ee
...
...
@@ -140,7 +140,6 @@ static void nr_rrc_manage_rlc_bearers(const instance_t instance,
const
rnti_t
rnti
);
static
void
nr_rrc_ue_process_RadioBearerConfig
(
NR_UE_RRC_INST_t
*
ue_rrc
,
rnti_t
rnti
,
rrcPerNB_t
*
rrcNB
,
NR_RadioBearerConfig_t
*
const
radioBearerConfig
);
static
void
nr_rrc_ue_generate_RRCSetupRequest
(
NR_UE_RRC_INST_t
*
rrc
,
rnti_t
rnti
);
...
...
@@ -148,12 +147,10 @@ static void nr_rrc_ue_generate_rrcReestablishmentComplete(NR_RRCReestablishment_
static
void
process_lte_nsa_msg
(
NR_UE_RRC_INST_t
*
rrc
,
nsa_msg_t
*
msg
,
int
msg_len
);
static
void
nr_rrc_ue_process_rrcReconfiguration
(
const
instance_t
instance
,
int
gNB_index
,
rnti_t
rnti
,
NR_RRCReconfiguration_t
*
rrcReconfiguration
);
static
void
nr_rrc_ue_process_ueCapabilityEnquiry
(
NR_UE_RRC_INST_t
*
rrc
,
NR_UECapabilityEnquiry_t
*
UECapabilityEnquiry
);
static
void
nr_rrc_ue_process_masterCellGroup
(
instance_t
instance
,
rnti_t
rnti
,
rrcPerNB_t
*
rrcNB
,
OCTET_STRING_t
*
masterCellGroup
,
long
*
fullConfig
);
...
...
@@ -162,7 +159,6 @@ void nr_rrc_ue_process_measConfig(rrcPerNB_t *rrc, NR_MeasConfig_t *const measCo
static
void
nr_rrc_ue_process_rrcReconfiguration
(
const
instance_t
instance
,
int
gNB_index
,
rnti_t
rnti
,
NR_RRCReconfiguration_t
*
rrcReconfiguration
)
{
NR_UE_RRC_INST_t
*
rrc
=
&
NR_UE_rrc_inst
[
instance
];
...
...
@@ -174,7 +170,7 @@ static void nr_rrc_ue_process_rrcReconfiguration(const instance_t instance,
if
(
ie
->
radioBearerConfig
!=
NULL
)
{
LOG_I
(
NR_RRC
,
"radio Bearer Configuration is present
\n
"
);
nr_rrc_ue_process_RadioBearerConfig
(
rrc
,
r
nti
,
r
rcNB
,
ie
->
radioBearerConfig
);
nr_rrc_ue_process_RadioBearerConfig
(
rrc
,
rrcNB
,
ie
->
radioBearerConfig
);
if
(
LOG_DEBUGFLAG
(
DEBUG_ASN1
))
xer_fprint
(
stdout
,
&
asn_DEF_NR_RadioBearerConfig
,
(
const
void
*
)
ie
->
radioBearerConfig
);
}
...
...
@@ -182,7 +178,7 @@ static void nr_rrc_ue_process_rrcReconfiguration(const instance_t instance,
if
(
ie
->
nonCriticalExtension
)
{
NR_RRCReconfiguration_v1530_IEs_t
*
ext
=
ie
->
nonCriticalExtension
;
if
(
ext
->
masterCellGroup
)
nr_rrc_ue_process_masterCellGroup
(
instance
,
r
nti
,
r
rcNB
,
ext
->
masterCellGroup
,
ext
->
fullConfig
);
nr_rrc_ue_process_masterCellGroup
(
instance
,
rrcNB
,
ext
->
masterCellGroup
,
ext
->
fullConfig
);
/* Check if there is dedicated NAS information to forward to NAS */
if
(
ie
->
nonCriticalExtension
->
dedicatedNAS_MessageList
)
{
struct
NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList
*
tmp
=
ext
->
dedicatedNAS_MessageList
;
...
...
@@ -263,7 +259,7 @@ void process_nsa_message(NR_UE_RRC_INST_t *rrc, nsa_message_t nsa_message_type,
SEQUENCE_free
(
&
asn_DEF_NR_RRCReconfiguration
,
RRCReconfiguration
,
1
);
return
;
}
nr_rrc_ue_process_rrcReconfiguration
(
0
,
0
,
rrc
->
rnti
,
RRCReconfiguration
);
nr_rrc_ue_process_rrcReconfiguration
(
0
,
0
,
RRCReconfiguration
);
ASN_STRUCT_FREE
(
asn_DEF_NR_RRCReconfiguration
,
RRCReconfiguration
);
}
break
;
...
...
@@ -289,7 +285,7 @@ void process_nsa_message(NR_UE_RRC_INST_t *rrc, nsa_message_t nsa_message_type,
RadioBearerConfig
->
drb_ToAddModList
->
list
.
array
[
0
]
->
drb_Identity
,
RadioBearerConfig
->
securityConfig
->
securityAlgorithmConfig
->
cipheringAlgorithm
,
*
RadioBearerConfig
->
securityConfig
->
keyToUse
);
nr_rrc_ue_process_RadioBearerConfig
(
rrc
,
rrc
->
rnti
,
rrc
->
perNB
+
0
,
RadioBearerConfig
);
nr_rrc_ue_process_RadioBearerConfig
(
rrc
,
rrc
->
perNB
+
0
,
RadioBearerConfig
);
}
if
(
LOG_DEBUGFLAG
(
DEBUG_ASN1
))
xer_fprint
(
stdout
,
&
asn_DEF_NR_RadioBearerConfig
,
(
const
void
*
)
RadioBearerConfig
);
...
...
@@ -309,6 +305,7 @@ NR_UE_RRC_INST_t* openair_rrc_top_init_ue_nr(char* uecap_file)
NR_UE_rrc_inst
=
(
NR_UE_RRC_INST_t
*
)
calloc
(
NB_NR_UE_INST
,
sizeof
(
NR_UE_RRC_INST_t
));
for
(
int
nr_ue
=
0
;
nr_ue
<
NB_NR_UE_INST
;
nr_ue
++
)
{
NR_UE_RRC_INST_t
*
rrc
=
&
NR_UE_rrc_inst
[
nr_ue
];
rrc
->
ue_id
=
nr_ue
;
// fill UE-NR-Capability @ UE-CapabilityRAT-Container here.
rrc
->
selected_plmn_identity
=
1
;
...
...
@@ -824,7 +821,6 @@ void nr_rrc_cellgroup_configuration(rrcPerNB_t *rrcNB,
static
void
nr_rrc_ue_process_masterCellGroup
(
instance_t
instance
,
rnti_t
rnti
,
rrcPerNB_t
*
rrcNB
,
OCTET_STRING_t
*
masterCellGroup
,
long
*
fullConfig
)
...
...
@@ -847,7 +843,7 @@ static void nr_rrc_ue_process_masterCellGroup(instance_t instance,
nr_rrc_mac_config_req_cg
(
instance
,
0
,
cellGroupConfig
);
}
static
void
rrc_ue_generate_RRCSetupComplete
(
instance_t
instance
,
rnti_t
rnti
,
const
uint8_t
Transaction_id
,
uint8_t
sel_plmn_id
)
static
void
rrc_ue_generate_RRCSetupComplete
(
instance_t
instance
,
const
uint8_t
Transaction_id
,
uint8_t
sel_plmn_id
)
{
uint8_t
buffer
[
100
];
uint8_t
size
;
...
...
@@ -870,7 +866,7 @@ static void rrc_ue_generate_RRCSetupComplete(instance_t instance, rnti_t rnti, c
int
srb_id
=
1
;
// RRC setup complete on SRB1
LOG_D
(
NR_RRC
,
"[RRC_UE %ld] PDCP_DATA_REQ/%d Bytes RRCSetupComplete ---> %d
\n
"
,
instance
,
size
,
srb_id
);
nr_pdcp_data_req_srb
(
rnti
,
srb_id
,
0
,
size
,
buffer
,
deliver_pdu_srb_rlc
,
NULL
);
nr_pdcp_data_req_srb
(
instance
,
srb_id
,
0
,
size
,
buffer
,
deliver_pdu_srb_rlc
,
NULL
);
}
static
void
nr_rrc_process_rrcsetup
(
const
instance_t
instance
,
...
...
@@ -887,13 +883,11 @@ static void nr_rrc_process_rrcsetup(const instance_t instance,
// perform the cell group configuration procedure in accordance with the received masterCellGroup
rrc
->
rnti
=
rnti
;
nr_rrc_ue_process_masterCellGroup
(
instance
,
rnti
,
rrc
->
perNB
+
gNB_index
,
&
rrcSetup
->
criticalExtensions
.
choice
.
rrcSetup
->
masterCellGroup
,
NULL
);
// perform the radio bearer configuration procedure in accordance with the received radioBearerConfig
nr_rrc_ue_process_RadioBearerConfig
(
rrc
,
rnti
,
rrc
->
perNB
+
gNB_index
,
&
rrcSetup
->
criticalExtensions
.
choice
.
rrcSetup
->
radioBearerConfig
);
...
...
@@ -920,7 +914,6 @@ static void nr_rrc_process_rrcsetup(const instance_t instance,
// set the content of RRCSetupComplete message
// TODO procedues described in 5.3.3.4 seems more complex than what we actualy do
rrc_ue_generate_RRCSetupComplete
(
instance
,
rnti
,
rrcSetup
->
rrc_TransactionIdentifier
,
rrc
->
selected_plmn_identity
);
}
...
...
@@ -981,7 +974,6 @@ static int8_t nr_rrc_ue_decode_ccch(const instance_t instance,
static
void
nr_rrc_ue_process_securityModeCommand
(
NR_UE_RRC_INST_t
*
ue_rrc
,
NR_SecurityModeCommand_t
*
const
securityModeCommand
,
rnti_t
rnti
,
const
uint8_t
gNB_index
)
{
int
securityMode
=
0
;
...
...
@@ -1055,7 +1047,7 @@ static void nr_rrc_ue_process_securityModeCommand(NR_UE_RRC_INST_t *ue_rrc,
// configure lower layers to apply SRB integrity protection and ciphering
for
(
int
i
=
1
;
i
<
NR_NUM_SRB
;
i
++
)
{
if
(
ue_rrc
->
perNB
[
gNB_index
].
Srb
[
i
]
==
RB_ESTABLISHED
)
nr_pdcp_config_set_security
(
rnti
,
i
,
security_mode
,
kRRCenc
,
kRRCint
,
kUPenc
);
nr_pdcp_config_set_security
(
ue_rrc
->
ue_id
,
i
,
security_mode
,
kRRCenc
,
kRRCint
,
kUPenc
);
}
}
else
{
LOG_I
(
NR_RRC
,
"skipped pdcp_config_set_security() as securityMode == 0x%02x"
,
securityMode
);
...
...
@@ -1092,7 +1084,7 @@ static void nr_rrc_ue_process_securityModeCommand(NR_UE_RRC_INST_t *ue_rrc,
// for the UE to declare AS security to be activated
ue_rrc
->
as_security_activated
=
true
;
int
srb_id
=
1
;
// SecurityModeComplete in SRB1
nr_pdcp_data_req_srb
(
rnti
,
srb_id
,
0
,
(
enc_rval
.
encoded
+
7
)
/
8
,
buffer
,
deliver_pdu_srb_rlc
,
NULL
);
nr_pdcp_data_req_srb
(
ue_rrc
->
ue_id
,
srb_id
,
0
,
(
enc_rval
.
encoded
+
7
)
/
8
,
buffer
,
deliver_pdu_srb_rlc
,
NULL
);
}
else
LOG_W
(
NR_RRC
,
"securityModeCommand->criticalExtensions.present (%d) != "
...
...
@@ -1214,15 +1206,15 @@ void nr_rrc_ue_process_measConfig(rrcPerNB_t *rrc, NR_MeasConfig_t *const measCo
}
static
void
nr_rrc_ue_process_RadioBearerConfig
(
NR_UE_RRC_INST_t
*
ue_rrc
,
rnti_t
rnti
,
rrcPerNB_t
*
rrcNB
,
NR_RadioBearerConfig_t
*
const
radioBearerConfig
)
{
if
(
LOG_DEBUGFLAG
(
DEBUG_ASN1
))
xer_fprint
(
stdout
,
&
asn_DEF_NR_RadioBearerConfig
,
(
const
void
*
)
radioBearerConfig
);
instance_t
instance
=
ue_rrc
->
ue_id
;
if
(
radioBearerConfig
->
srb3_ToRelease
)
nr_pdcp_release_srb
(
rnti
,
3
);
nr_pdcp_release_srb
(
instance
,
3
);
uint8_t
kRRCenc
[
16
]
=
{
0
};
uint8_t
kRRCint
[
16
]
=
{
0
};
...
...
@@ -1249,7 +1241,7 @@ static void nr_rrc_ue_process_RadioBearerConfig(NR_UE_RRC_INST_t *ue_rrc,
struct
NR_SRB_ToAddMod
*
srb
=
radioBearerConfig
->
srb_ToAddModList
->
list
.
array
[
cnt
];
if
(
rrcNB
->
Srb
[
srb
->
srb_Identity
]
==
RB_NOT_PRESENT
)
add_srb
(
false
,
rnti
,
instance
,
radioBearerConfig
->
srb_ToAddModList
->
list
.
array
[
cnt
],
ue_rrc
->
cipheringAlgorithm
,
ue_rrc
->
integrityProtAlgorithm
,
...
...
@@ -1259,7 +1251,7 @@ static void nr_rrc_ue_process_RadioBearerConfig(NR_UE_RRC_INST_t *ue_rrc,
AssertFatal
(
srb
->
discardOnPDCP
==
NULL
,
"discardOnPDCP not yet implemented
\n
"
);
AssertFatal
(
srb
->
reestablishPDCP
==
NULL
,
"reestablishPDCP not yet implemented
\n
"
);
if
(
srb
->
pdcp_Config
&&
srb
->
pdcp_Config
->
t_Reordering
)
nr_pdcp_reconfigure_srb
(
rnti
,
srb
->
srb_Identity
,
*
srb
->
pdcp_Config
->
t_Reordering
);
nr_pdcp_reconfigure_srb
(
instance
,
srb
->
srb_Identity
,
*
srb
->
pdcp_Config
->
t_Reordering
);
}
rrcNB
->
Srb
[
srb
->
srb_Identity
]
=
RB_ESTABLISHED
;
}
...
...
@@ -1269,7 +1261,7 @@ static void nr_rrc_ue_process_RadioBearerConfig(NR_UE_RRC_INST_t *ue_rrc,
for
(
int
cnt
=
0
;
cnt
<
radioBearerConfig
->
drb_ToReleaseList
->
list
.
count
;
cnt
++
)
{
NR_DRB_Identity_t
*
DRB_id
=
radioBearerConfig
->
drb_ToReleaseList
->
list
.
array
[
cnt
];
if
(
DRB_id
)
nr_pdcp_release_drb
(
rnti
,
*
DRB_id
);
nr_pdcp_release_drb
(
instance
,
*
DRB_id
);
}
}
...
...
@@ -1283,13 +1275,13 @@ static void nr_rrc_ue_process_RadioBearerConfig(NR_UE_RRC_INST_t *ue_rrc,
AssertFatal
(
drb
->
recoverPDCP
==
NULL
,
"recoverPDCP not yet implemented
\n
"
);
NR_SDAP_Config_t
*
sdap_Config
=
drb
->
cnAssociation
?
drb
->
cnAssociation
->
choice
.
sdap_Config
:
NULL
;
if
(
drb
->
pdcp_Config
||
sdap_Config
)
nr_pdcp_reconfigure_drb
(
rnti
,
DRB_id
,
drb
->
pdcp_Config
,
sdap_Config
);
nr_pdcp_reconfigure_drb
(
instance
,
DRB_id
,
drb
->
pdcp_Config
,
sdap_Config
);
if
(
drb
->
cnAssociation
)
AssertFatal
(
drb
->
cnAssociation
->
choice
.
sdap_Config
==
NULL
,
"SDAP reconfiguration not yet implemented
\n
"
);
}
else
{
rrcNB
->
status_DRBs
[
DRB_id
]
=
RB_ESTABLISHED
;
add_drb
(
false
,
rnti
,
instance
,
radioBearerConfig
->
drb_ToAddModList
->
list
.
array
[
cnt
],
ue_rrc
->
cipheringAlgorithm
,
ue_rrc
->
integrityProtAlgorithm
,
...
...
@@ -1303,7 +1295,7 @@ static void nr_rrc_ue_process_RadioBearerConfig(NR_UE_RRC_INST_t *ue_rrc,
LOG_I
(
NR_RRC
,
"State = NR_RRC_CONNECTED
\n
"
);
}
static
void
nr_rrc_ue_generate_RRCReconfigurationComplete
(
rnti_t
rnti
,
const
int
srb_id
,
const
uint8_t
Transaction_id
)
static
void
nr_rrc_ue_generate_RRCReconfigurationComplete
(
instance_t
instance
,
const
int
srb_id
,
const
uint8_t
Transaction_id
)
{
uint8_t
buffer
[
32
],
size
;
size
=
do_NR_RRCReconfigurationComplete
(
buffer
,
sizeof
(
buffer
),
Transaction_id
);
...
...
@@ -1314,11 +1306,10 @@ static void nr_rrc_ue_generate_RRCReconfigurationComplete(rnti_t rnti, const int
"--->][PDCP][RB %02d]
\n
"
,
size
,
srb_id
);
nr_pdcp_data_req_srb
(
rnti
,
srb_id
,
0
,
size
,
buffer
,
deliver_pdu_srb_rlc
,
NULL
);
nr_pdcp_data_req_srb
(
instance
,
srb_id
,
0
,
size
,
buffer
,
deliver_pdu_srb_rlc
,
NULL
);
}
static
int
nr_rrc_ue_decode_dcch
(
instance_t
instance
,
rnti_t
rnti
,
const
srb_id_t
Srb_id
,
const
uint8_t
*
const
Buffer
,
size_t
Buffer_size
,
...
...
@@ -1353,8 +1344,8 @@ static int nr_rrc_ue_decode_dcch(instance_t instance,
break
;
case
NR_DL_DCCH_MessageType__c1_PR_rrcReconfiguration
:
{
nr_rrc_ue_process_rrcReconfiguration
(
instance
,
gNB_indexP
,
rnti
,
c1
->
choice
.
rrcReconfiguration
);
nr_rrc_ue_generate_RRCReconfigurationComplete
(
rnti
,
Srb_id
,
c1
->
choice
.
rrcReconfiguration
->
rrc_TransactionIdentifier
);
nr_rrc_ue_process_rrcReconfiguration
(
instance
,
gNB_indexP
,
c1
->
choice
.
rrcReconfiguration
);
nr_rrc_ue_generate_RRCReconfigurationComplete
(
instance
,
Srb_id
,
c1
->
choice
.
rrcReconfiguration
->
rrc_TransactionIdentifier
);
}
break
;
case
NR_DL_DCCH_MessageType__c1_PR_rrcResume
:
...
...
@@ -1408,7 +1399,7 @@ static int nr_rrc_ue_decode_dcch(instance_t instance,
break
;
case
NR_DL_DCCH_MessageType__c1_PR_securityModeCommand
:
LOG_I
(
NR_RRC
,
"Received securityModeCommand (gNB %d)
\n
"
,
gNB_indexP
);
nr_rrc_ue_process_securityModeCommand
(
rrc
,
c1
->
choice
.
securityModeCommand
,
rnti
,
gNB_indexP
);
nr_rrc_ue_process_securityModeCommand
(
rrc
,
c1
->
choice
.
securityModeCommand
,
gNB_indexP
);
break
;
}
}
break
;
...
...
@@ -1502,7 +1493,6 @@ void *rrc_nrue(void *notUsed)
case
NR_RRC_DCCH_DATA_IND
:
nr_rrc_ue_decode_dcch
(
instance
,
NR_RRC_DCCH_DATA_IND
(
msg_p
).
rnti
,
NR_RRC_DCCH_DATA_IND
(
msg_p
).
dcch_index
,
NR_RRC_DCCH_DATA_IND
(
msg_p
).
sdu_p
,
NR_RRC_DCCH_DATA_IND
(
msg_p
).
sdu_size
,
...
...
@@ -1531,7 +1521,7 @@ void *rrc_nrue(void *notUsed)
// check if SRB2 is created, if yes request data_req on SRB2
// error: the remote gNB is hardcoded here
rb_id_t
srb_id
=
rrc
->
perNB
[
0
].
Srb
[
2
]
==
RB_ESTABLISHED
?
2
:
1
;
nr_pdcp_data_req_srb
(
rrc
->
rnti
,
srb_id
,
0
,
length
,
buffer
,
deliver_pdu_srb_rlc
,
NULL
);
nr_pdcp_data_req_srb
(
instance
,
srb_id
,
0
,
length
,
buffer
,
deliver_pdu_srb_rlc
,
NULL
);
break
;
}
...
...
@@ -1643,7 +1633,7 @@ static void nr_rrc_ue_process_ueCapabilityEnquiry(NR_UE_RRC_INST_t *rrc, NR_UECa
}
LOG_I
(
NR_RRC
,
"UECapabilityInformation Encoded %zd bits (%zd bytes)
\n
"
,
enc_rval
.
encoded
,(
enc_rval
.
encoded
+
7
)
/
8
);
int
srb_id
=
1
;
// UECapabilityInformation on SRB1
nr_pdcp_data_req_srb
(
rrc
->
rnti
,
srb_id
,
0
,
(
enc_rval
.
encoded
+
7
)
/
8
,
buffer
,
deliver_pdu_srb_rlc
,
NULL
);
nr_pdcp_data_req_srb
(
rrc
->
ue_id
,
srb_id
,
0
,
(
enc_rval
.
encoded
+
7
)
/
8
,
buffer
,
deliver_pdu_srb_rlc
,
NULL
);
}
}
}
...
...
@@ -1932,13 +1922,13 @@ void nr_rrc_going_to_IDLE(instance_t instance,
for
(
int
i
=
0
;
i
<
MAX_DRBS_PER_UE
;
i
++
)
{
if
(
nb
->
status_DRBs
[
i
]
!=
RB_NOT_PRESENT
)
{
nb
->
status_DRBs
[
i
]
=
RB_NOT_PRESENT
;
nr_pdcp_release_drb
(
rrc
->
rnti
,
i
);
nr_pdcp_release_drb
(
instance
,
i
);
}
}
for
(
int
i
=
1
;
i
<
NR_NUM_SRB
;
i
++
)
{
if
(
nb
->
Srb
[
i
]
!=
RB_NOT_PRESENT
)
{
nb
->
Srb
[
i
]
=
RB_NOT_PRESENT
;
nr_pdcp_release_srb
(
rrc
->
rnti
,
i
);
nr_pdcp_release_srb
(
instance
,
i
);
}
}
for
(
int
i
=
0
;
i
<
NR_MAX_NUM_LCID
;
i
++
)
{
...
...
openair2/RRC/NR_UE/rrc_defs.h
View file @
82e323ee
...
...
@@ -206,6 +206,8 @@ typedef struct rrcPerNB {
}
rrcPerNB_t
;
typedef
struct
NR_UE_RRC_INST_s
{
instance_t
ue_id
;
rrcPerNB_t
perNB
[
NB_CNX_UE
];
char
*
uecap_file
;
...
...
openair2/SDAP/nr_sdap/nr_sdap_entity.c
View file @
82e323ee
...
...
@@ -404,7 +404,15 @@ void nr_sdap_ue_qfi2drb_config(nr_sdap_entity_t *existing_sdap_entity, rb_id_t p
}
}
nr_sdap_entity_t
*
new_nr_sdap_entity
(
int
is_gnb
,
bool
has_sdap_rx
,
bool
has_sdap_tx
,
ue_id_t
ue_id
,
int
pdusession_id
,
bool
is_defaultDRB
,
uint8_t
drb_identity
,
NR_QFI_t
*
mapped_qfi_2_add
,
uint8_t
mappedQFIs2AddCount
)
nr_sdap_entity_t
*
new_nr_sdap_entity
(
int
is_gnb
,
bool
has_sdap_rx
,
bool
has_sdap_tx
,
ue_id_t
ue_id
,
int
pdusession_id
,
bool
is_defaultDRB
,
uint8_t
drb_identity
,
NR_QFI_t
*
mapped_qfi_2_add
,
uint8_t
mappedQFIs2AddCount
)
{
if
(
nr_sdap_get_entity
(
ue_id
,
pdusession_id
))
{
LOG_E
(
SDAP
,
"SDAP Entity for UE already exists with RNTI/UE ID: %lu and PDU SESSION ID: %d
\n
"
,
ue_id
,
pdusession_id
);
...
...
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