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
spbro
OpenXG-RAN
Commits
3f02d18f
Commit
3f02d18f
authored
Sep 12, 2020
by
Xue Song
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NR RRC ASN1 version upgrade release 16
Add RRCSetupRequest message Add RRCReject message
parent
3c84c4d8
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
406 additions
and
11 deletions
+406
-11
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+3
-3
openair2/COMMON/mac_messages_def.h
openair2/COMMON/mac_messages_def.h
+3
-0
openair2/COMMON/mac_messages_types.h
openair2/COMMON/mac_messages_types.h
+11
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+1
-1
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+42
-1
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/MESSAGES/asn1_msg.h
+3
-0
openair2/RRC/NR/nr_rrc_defs.h
openair2/RRC/NR/nr_rrc_defs.h
+3
-2
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+262
-1
openair2/RRC/NR/rrc_gNB_UE_context.c
openair2/RRC/NR/rrc_gNB_UE_context.c
+57
-0
openair2/RRC/NR/rrc_gNB_UE_context.h
openair2/RRC/NR/rrc_gNB_UE_context.h
+18
-0
openair2/RRC/NR/rrc_gNB_reconfig.c
openair2/RRC/NR/rrc_gNB_reconfig.c
+3
-3
No files found.
cmake_targets/CMakeLists.txt
View file @
3f02d18f
...
...
@@ -356,9 +356,9 @@ include_directories ("${RRC_FULL_DIR}")
#NR RRC
#######
set
(
NR_RRC_ASN1_VERSION
"NR_Rel1
5
"
)
make_version
(
NR_RRC_VERSION 1
5 6
0
)
set
(
NR_RRC_GRAMMAR
${
OPENAIR2_DIR
}
/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-1
5.6
.0.asn1
)
set
(
NR_RRC_ASN1_VERSION
"NR_Rel1
6
"
)
make_version
(
NR_RRC_VERSION 1
6 1
0
)
set
(
NR_RRC_GRAMMAR
${
OPENAIR2_DIR
}
/RRC/NR/MESSAGES/asn1c/ASN1_files/nr-rrc-1
6.1
.0.asn1
)
add_definitions
(
-DNR_RRC_VERSION=
${
NR_RRC_VERSION
}
)
set
(
NR_RRC_FULL_DIR
${
asn1_generated_dir
}
/RRC_
${
NR_RRC_ASN1_VERSION
}
)
...
...
openair2/COMMON/mac_messages_def.h
View file @
3f02d18f
...
...
@@ -41,6 +41,9 @@ MESSAGE_DEF(RRC_MAC_CCCH_DATA_REQ, MESSAGE_PRIORITY_MED_PLUS, RrcMacCcchDat
MESSAGE_DEF
(
RRC_MAC_CCCH_DATA_CNF
,
MESSAGE_PRIORITY_MED_PLUS
,
RrcMacCcchDataCnf
,
rrc_mac_ccch_data_cnf
)
MESSAGE_DEF
(
RRC_MAC_CCCH_DATA_IND
,
MESSAGE_PRIORITY_MED_PLUS
,
RrcMacCcchDataInd
,
rrc_mac_ccch_data_ind
)
// gNB
MESSAGE_DEF
(
NR_RRC_MAC_CCCH_DATA_IND
,
MESSAGE_PRIORITY_MED_PLUS
,
NR_RrcMacCcchDataInd
,
nr_rrc_mac_ccch_data_ind
)
MESSAGE_DEF
(
RRC_MAC_MCCH_DATA_REQ
,
MESSAGE_PRIORITY_MED_PLUS
,
RrcMacMcchDataReq
,
rrc_mac_mcch_data_req
)
MESSAGE_DEF
(
RRC_MAC_MCCH_DATA_IND
,
MESSAGE_PRIORITY_MED_PLUS
,
RrcMacMcchDataInd
,
rrc_mac_mcch_data_ind
)
...
...
openair2/COMMON/mac_messages_types.h
View file @
3f02d18f
...
...
@@ -45,6 +45,7 @@
#define RRC_MAC_CCCH_DATA_REQ(mSGpTR) (mSGpTR)->ittiMsg.rrc_mac_ccch_data_req
#define RRC_MAC_CCCH_DATA_CNF(mSGpTR) (mSGpTR)->ittiMsg.rrc_mac_ccch_data_cnf
#define RRC_MAC_CCCH_DATA_IND(mSGpTR) (mSGpTR)->ittiMsg.rrc_mac_ccch_data_ind
#define NR_RRC_MAC_CCCH_DATA_IND(mSGpTR) (mSGpTR)->ittiMsg.nr_rrc_mac_ccch_data_ind
#define RRC_MAC_MCCH_DATA_REQ(mSGpTR) (mSGpTR)->ittiMsg.rrc_mac_mcch_data_req
#define RRC_MAC_MCCH_DATA_IND(mSGpTR) (mSGpTR)->ittiMsg.rrc_mac_mcch_data_ind
...
...
@@ -126,6 +127,16 @@ typedef struct RrcMacCcchDataInd_s {
int
CC_id
;
}
RrcMacCcchDataInd
;
typedef
struct
NR_RrcMacCcchDataInd_s
{
uint32_t
frame
;
uint8_t
sub_frame
;
uint16_t
rnti
;
uint32_t
sdu_size
;
uint8_t
sdu
[
CCCH_SDU_SIZE
];
uint8_t
gnb_index
;
int
CC_id
;
}
NR_RrcMacCcchDataInd
;
typedef
struct
RrcMacMcchDataReq_s
{
uint32_t
frame
;
uint32_t
sdu_size
;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
3f02d18f
...
...
@@ -624,7 +624,7 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
AssertFatal
(
1
==
0
,
"Couldn't fine pucch resource indicator %d in PUCCH resource set %d for %d UCI bits"
,
pucch_resource
,
i
,
O_uci
);
}
else
{
N3
=
pucchresset
->
maxPayload
Minus1
!=
NULL
?
*
pucchresset
->
maxPayloadMinus1
:
1706
;
N3
=
pucchresset
->
maxPayload
Size
!=
NULL
?
*
pucchresset
->
maxPayloadSize
:
1706
;
if
(
N2
<
O_uci
&&
N3
>
O_uci
)
{
if
(
pucch_resource
<
n_list
)
resource_id
=
pucchresset
->
resourceList
.
list
.
array
[
pucch_resource
];
...
...
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
3f02d18f
...
...
@@ -42,7 +42,10 @@
#include "asn1_msg.h"
#include "RRC/NR/nr_rrc_extern.h"
#if defined(NR_Rel15)
#include "NR_DL-CCCH-Message.h"
#include "NR_RRCReject.h"
#include "NR_RejectWaitTime.h"
#if defined(NR_Rel16)
#include "NR_SCS-SpecificCarrier.h"
#include "NR_TDD-UL-DL-ConfigCommon.h"
#include "NR_FrequencyInfoUL.h"
...
...
@@ -578,3 +581,41 @@ void do_SpCellConfig(gNB_RRC_INST *rrc,
spconfig
->
reconfigurationWithSync
=
CALLOC
(
1
,
sizeof
(
struct
NR_ReconfigurationWithSync
));
}
//------------------------------------------------------------------------------
uint8_t
do_RRCReject
(
uint8_t
Mod_id
,
uint8_t
*
const
buffer
)
//------------------------------------------------------------------------------
{
asn_enc_rval_t
enc_rval
;;
NR_DL_CCCH_Message_t
dl_ccch_msg
;
NR_RRCReject_t
*
rrcReject
;
NR_RejectWaitTime_t
waitTime
=
1
;
memset
((
void
*
)
&
dl_ccch_msg
,
0
,
sizeof
(
NR_DL_CCCH_Message_t
));
dl_ccch_msg
.
message
.
present
=
NR_DL_CCCH_MessageType_PR_c1
;
dl_ccch_msg
.
message
.
choice
.
c1
->
present
=
NR_RRCReject__criticalExtensions_PR_rrcReject
;
rrcReject
=
dl_ccch_msg
.
message
.
choice
.
c1
->
choice
.
rrcReject
;
rrcReject
->
criticalExtensions
.
present
=
NR_RRCReject__criticalExtensions_PR_rrcReject
;
rrcReject
->
criticalExtensions
.
choice
.
rrcReject
->
waitTime
=
&
waitTime
;
if
(
LOG_DEBUGFLAG
(
DEBUG_ASN1
)
)
{
xer_fprint
(
stdout
,
&
asn_DEF_NR_DL_CCCH_Message
,
(
void
*
)
&
dl_ccch_msg
);
}
enc_rval
=
uper_encode_to_buffer
(
&
asn_DEF_NR_DL_CCCH_Message
,
NULL
,
(
void
*
)
&
dl_ccch_msg
,
buffer
,
100
);
if
(
enc_rval
.
encoded
==
-
1
)
{
LOG_E
(
RRC
,
"[gNB AssertFatal]ASN1 message encoding failed (%s, %lu)!
\n
"
,
enc_rval
.
failed_type
->
name
,
enc_rval
.
encoded
);
return
-
1
;
}
LOG_D
(
RRC
,
"RRCReject Encoded %zd bits (%zd bytes)
\n
"
,
enc_rval
.
encoded
,(
enc_rval
.
encoded
+
7
)
/
8
);
return
((
enc_rval
.
encoded
+
7
)
/
8
);
}
openair2/RRC/NR/MESSAGES/asn1_msg.h
View file @
3f02d18f
...
...
@@ -82,3 +82,6 @@ void do_PHYSICALCELLGROUP(uint8_t Mod_id,
void
do_SpCellConfig
(
gNB_RRC_INST
*
rrc
,
struct
NR_SpCellConfig
*
spconfig
);
uint8_t
do_RRCReject
(
uint8_t
Mod_id
,
uint8_t
*
const
buffer
);
openair2/RRC/NR/nr_rrc_defs.h
View file @
3f02d18f
...
...
@@ -54,6 +54,7 @@
#include "NR_BCCH-BCH-Message.h"
#include "NR_PLMN-IdentityInfo.h"
#include "NR_MCC-MNC-Digit.h"
#include "NR_NG-5G-S-TMSI.h"
//#include "MCCH-Message.h"
//#include "MBSFNAreaConfiguration-r9.h"
//#include "SCellToAddMod-r10.h"
...
...
@@ -290,8 +291,8 @@ typedef struct gNB_RRC_UE_s {
rnti_t
rnti
;
uint64_t
random_ue_identity
;
/* Information from UE RRC
Connection
Request */
UE_S_TMSI
Initialue_identity
_s_TMSI
;
/* Information from UE RRC
Setup
Request */
uint64_t
Initialue_identity_5g
_s_TMSI
;
NR_EstablishmentCause_t
establishment_cause
;
/* Information from UE RRC ConnectionReestablishmentRequest */
...
...
openair2/RRC/NR/rrc_gNB.c
View file @
3f02d18f
...
...
@@ -51,6 +51,8 @@
#include "NR_MeasResults.h"
#include "LTE_UECapabilityInformation.h"
#include "LTE_UL-DCCH-Message.h"
#include "NR_UL-CCCH-Message.h"
#include "NR_RRCSetupRequest-IEs.h"
#include "rlc.h"
#include "rrc_eNB_UE_context.h"
...
...
@@ -297,6 +299,241 @@ void rrc_gNB_process_AdditionRequestInformation(const module_id_t gnb_mod_idP, x
parse_CG_ConfigInfo
(
rrc
,
cg_configinfo
,
m
);
}
//-----------------------------------------------------------------------------
// return the ue context if there is already an UE with the same S-TMSI, NULL otherwise
static
struct
rrc_gNB_ue_context_s
*
rrc_gNB_ue_context_5g_stmsi_exist
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
NR_NG_5G_S_TMSI_t
*
s_TMSI
)
//-----------------------------------------------------------------------------
{
struct
rrc_gNB_ue_context_s
*
ue_context_p
=
NULL
;
uint64_t
s_TMSI_value
=
0
;
// 48-bit
// uint16_t amf_set_id = 0; // 10-bit
// uint8_t amf_pointer = 0; // 6-bit
// uint32_t tmsi = 0; // 32-bit
/* <5G-S-TMSI> = <AMF Set ID><AMF Pointer><5G-TMSI> 48-bit */
s_TMSI_value
=
*
(
s_TMSI
->
buf
);
// amf_set_id = s_TMSI_value >> 38;
// amf_pointer = (s_TMSI_value >> 32) & 0x3F;
// tmsi = (uint32_t)s_TMSI_value;
RB_FOREACH
(
ue_context_p
,
rrc_nr_ue_tree_s
,
&
(
RC
.
nrrrc
[
ctxt_pP
->
module_id
]
->
rrc_ue_head
))
{
LOG_I
(
RRC
,
"checking for UE 5G S-TMSI %x: rnti %x
\n
"
,
s_TMSI_value
,
ue_context_p
->
ue_context
.
rnti
);
if
(
ue_context_p
->
ue_context
.
Initialue_identity_5g_s_TMSI
==
s_TMSI_value
)
{
return
ue_context_p
;
}
}
return
NULL
;
}
//-----------------------------------------------------------------------------
void
rrc_gNB_generate_RRCSetup
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
rrc_gNB_ue_context_t
*
const
ue_context_pP
,
const
int
CC_id
)
//-----------------------------------------------------------------------------
{
LOG_I
(
RRC
,
"rrc_gNB_generate_RRCSetup
\n
"
);
}
void
rrc_gNB_generate_RRCReject
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
rrc_gNB_ue_context_t
*
const
ue_context_pP
,
const
int
CC_id
)
//-----------------------------------------------------------------------------
{
LOG_I
(
RRC
,
"rrc_gNB_generate_RRCReject
\n
"
);
gNB_RRC_UE_t
*
ue_p
=
&
ue_context_pP
->
ue_context
;
ue_p
->
Srb0
.
Tx_buffer
.
payload_size
=
do_RRCReject
(
ctxt_pP
->
module_id
,
(
uint8_t
*
)
ue_p
->
Srb0
.
Tx_buffer
.
Payload
);
LOG_DUMPMSG
(
RRC
,
DEBUG_RRC
,
(
char
*
)(
ue_p
->
Srb0
.
Tx_buffer
.
Payload
),
ue_p
->
Srb0
.
Tx_buffer
.
payload_size
,
"[MSG] RRCReject
\n
"
);
MSC_LOG_TX_MESSAGE
(
MSC_RRC_ENB
,
MSC_RRC_UE
,
ue_p
->
Srb0
.
Tx_buffer
.
Header
,
ue_p
->
Srb0
.
Tx_buffer
.
payload_size
,
MSC_AS_TIME_FMT
" NR_RRCReject UE %x size %u"
,
MSC_AS_TIME_ARGS
(
ctxt_pP
),
ue_context_pP
==
NULL
?
-
1
:
ue_context_pP
->
ue_context
.
rnti
,
ue_p
->
Srb0
.
Tx_buffer
.
payload_size
);
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" [RAPROC] Logical Channel DL-CCCH, Generating NR_RRCReject (bytes %d)
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
),
ue_p
->
Srb0
.
Tx_buffer
.
payload_size
);
}
/*------------------------------------------------------------------------------*/
int
nr_rrc_eNB_decode_ccch
(
protocol_ctxt_t
*
const
ctxt_pP
,
const
uint8_t
*
buffer
,
int
buffer_length
,
const
int
CC_id
)
{
module_id_t
Idx
;
asn_dec_rval_t
dec_rval
;
NR_UL_CCCH_Message_t
*
ul_ccch_msg
=
NULL
;
struct
rrc_gNB_ue_context_s
*
ue_context_p
=
NULL
;
gNB_RRC_INST
*
gnb_rrc_inst
=
RC
.
nrrrc
[
ctxt_pP
->
module_id
];
NR_RRCSetupRequest_IEs_t
*
rrcSetupRequest
=
NULL
;
uint64_t
random_value
=
0
;
dec_rval
=
uper_decode
(
NULL
,
&
asn_DEF_NR_UL_CCCH_Message
,
(
void
**
)
&
ul_ccch_msg
,
(
uint8_t
*
)
buffer
,
100
,
0
,
0
);
if
(
dec_rval
.
consumed
==
0
)
{
/* TODO */
// LOG_E(RRC, PROTOCOL_RRC_CTXT_UE_FMT" FATAL Error in receiving CCCH\n",
// PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
return
-
1
;
}
if
(
ul_ccch_msg
->
message
.
present
==
NR_UL_CCCH_MessageType_PR_c1
)
{
switch
(
ul_ccch_msg
->
message
.
choice
.
c1
->
present
)
{
case
NR_UL_CCCH_MessageType__c1_PR_NOTHING
:
/* TODO */
// LOG_I(RRC,
// PROTOCOL_RRC_CTXT_FMT" Received PR_NOTHING on UL-CCCH-Message\n",
// PROTOCOL_RRC_CTXT_ARGS(ctxt_pP));
break
;
case
NR_UL_CCCH_MessageType__c1_PR_rrcSetupRequest
:
ue_context_p
=
rrc_gNB_get_ue_context
(
gnb_rrc_inst
,
ctxt_pP
->
rnti
);
if
(
ue_context_p
!=
NULL
)
{
rrc_gNB_free_mem_UE_context
(
ctxt_pP
,
ue_context_p
);
MSC_LOG_RX_DISCARDED_MESSAGE
(
MSC_RRC_ENB
,
MSC_RRC_UE
,
buffer
,
dec_rval
.
consumed
,
MSC_AS_TIME_FMT
" NR_RRCSetupRequest UE %x size %u (UE already in context)"
,
MSC_AS_TIME_ARGS
(
ctxt_pP
),
ue_context_p
->
ue_context
.
rnti
,
dec_rval
.
consumed
);
}
else
{
rrcSetupRequest
=
&
ul_ccch_msg
->
message
.
choice
.
c1
->
choice
.
rrcSetupRequest
->
rrcSetupRequest
;
if
(
NR_InitialUE_Identity_PR_randomValue
==
rrcSetupRequest
->
ue_Identity
.
present
)
{
if
(
rrcSetupRequest
->
ue_Identity
.
choice
.
randomValue
.
size
!=
5
)
{
// 39-bit random value
LOG_E
(
RRC
,
"wrong InitialUE-Identity randomValue size, expected 5, provided %lu"
,
(
long
unsigned
int
)
rrcSetupRequest
->
ue_Identity
.
choice
.
randomValue
.
size
);
return
-
1
;
}
memcpy
(((
uint8_t
*
)
&
random_value
)
+
3
,
rrcSetupRequest
->
ue_Identity
.
choice
.
randomValue
.
buf
,
rrcSetupRequest
->
ue_Identity
.
choice
.
randomValue
.
size
);
/* if there is already a registered UE (with another RNTI) with this random_value,
* the current one must be removed from MAC/PHY (zombie UE)
*/
if
((
ue_context_p
=
rrc_gNB_ue_context_random_exist
(
RC
.
nrrrc
[
ctxt_pP
->
module_id
],
random_value
)))
{
LOG_W
(
RRC
,
"new UE rnti %x (coming with random value) is already there as UE %x, removing %x from MAC/PHY
\n
"
,
ctxt_pP
->
rnti
,
ue_context_p
->
ue_context
.
rnti
,
ue_context_p
->
ue_context
.
rnti
);
ue_context_p
->
ue_context
.
ul_failure_timer
=
20000
;
}
ue_context_p
=
rrc_gNB_get_next_free_ue_context
(
ctxt_pP
,
RC
.
nrrrc
[
ctxt_pP
->
module_id
],
random_value
);
ue_context_p
->
ue_context
.
Srb0
.
Srb_id
=
0
;
ue_context_p
->
ue_context
.
Srb0
.
Active
=
1
;
memcpy
(
ue_context_p
->
ue_context
.
Srb0
.
Rx_buffer
.
Payload
,
buffer
,
buffer_length
);
ue_context_p
->
ue_context
.
Srb0
.
Rx_buffer
.
payload_size
=
buffer_length
;
}
else
if
(
NR_InitialUE_Identity_PR_ng_5G_S_TMSI_Part1
==
rrcSetupRequest
->
ue_Identity
.
present
)
{
/* TODO */
/* <5G-S-TMSI> = <AMF Set ID><AMF Pointer><5G-TMSI> 48-bit */
NR_NG_5G_S_TMSI_t
s_TMSI
=
rrcSetupRequest
->
ue_Identity
.
choice
.
ng_5G_S_TMSI_Part1
;
if
(
s_TMSI
.
size
!=
6
)
{
LOG_E
(
RRC
,
"Identity 5G_s_TMSI size, expected 6, provided %lu
\n
"
,
(
long
unsigned
int
)
s_TMSI
.
size
);
return
-
1
;
}
if
((
ue_context_p
=
rrc_gNB_ue_context_5g_stmsi_exist
(
ctxt_pP
,
&
s_TMSI
)))
{
LOG_I
(
RRC
,
" 5G-S-TMSI exists, ue_context_p %p, old rnti %x => %x
\n
"
,
ue_context_p
,
ue_context_p
->
ue_context
.
rnti
,
ctxt_pP
->
rnti
);
rrc_mac_remove_ue
(
ctxt_pP
->
module_id
,
ue_context_p
->
ue_context
.
rnti
);
/* replace rnti in the context */
/* for that, remove the context from the RB tree */
RB_REMOVE
(
rrc_nr_ue_tree_s
,
&
RC
.
nrrrc
[
ctxt_pP
->
module_id
]
->
rrc_ue_head
,
ue_context_p
);
/* and insert again, after changing rnti everywhere it has to be changed */
ue_context_p
->
ue_id_rnti
=
ctxt_pP
->
rnti
;
ue_context_p
->
ue_context
.
rnti
=
ctxt_pP
->
rnti
;
RB_INSERT
(
rrc_nr_ue_tree_s
,
&
RC
.
nrrrc
[
ctxt_pP
->
module_id
]
->
rrc_ue_head
,
ue_context_p
);
/* reset timers */
ue_context_p
->
ue_context
.
ul_failure_timer
=
0
;
ue_context_p
->
ue_context
.
ue_release_timer
=
0
;
ue_context_p
->
ue_context
.
ue_reestablishment_timer
=
0
;
ue_context_p
->
ue_context
.
ue_release_timer_s1
=
0
;
ue_context_p
->
ue_context
.
ue_release_timer_rrc
=
0
;
}
else
{
LOG_I
(
RRC
,
" 5G-S-TMSI doesn't exist, setting Initialue_identity_5g_s_TMSI to %p => %x
\n
"
,
ue_context_p
,
*
(
s_TMSI
.
buf
));
ue_context_p
=
rrc_gNB_get_next_free_ue_context
(
ctxt_pP
,
RC
.
nrrrc
[
ctxt_pP
->
module_id
],
*
(
s_TMSI
.
buf
));
if
(
ue_context_p
==
NULL
)
{
LOG_E
(
RRC
,
"%s:%d:%s: rrc_gNB_get_next_free_ue_context returned NULL
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
}
if
(
ue_context_p
!=
NULL
)
{
ue_context_p
->
ue_context
.
Initialue_identity_5g_s_TMSI
=
*
(
s_TMSI
.
buf
);
}
}
}
else
{
/* TODO */
// LOG_E(RRC,
// PROTOCOL_RRC_CTXT_UE_FMT" RRCSetupRequest without random UE identity or S-TMSI not supported, let's reject the UE\n",
// PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
rrc_gNB_generate_RRCReject
(
ctxt_pP
,
rrc_gNB_get_ue_context
(
gnb_rrc_inst
,
ctxt_pP
->
rnti
),
CC_id
);
break
;
}
}
if
(
ue_context_p
!=
NULL
)
{
ue_context_p
->
ue_context
.
establishment_cause
=
rrcSetupRequest
->
establishmentCause
;
}
rrc_gNB_generate_RRCSetup
(
ctxt_pP
,
rrc_gNB_get_ue_context
(
gnb_rrc_inst
,
ctxt_pP
->
rnti
),
CC_id
);
break
;
case
NR_UL_CCCH_MessageType__c1_PR_rrcResumeRequest
:
break
;
case
NR_UL_CCCH_MessageType__c1_PR_rrcReestablishmentRequest
:
break
;
case
NR_UL_CCCH_MessageType__c1_PR_rrcSystemInfoRequest
:
break
;
default:
/* TODO */
// LOG_E(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Unknown message\n",
// PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
break
;
}
}
}
///---------------------------------------------------------------------------------------------------------------///
///---------------------------------------------------------------------------------------------------------------///
void
*
rrc_gnb_task
(
void
*
args_p
)
{
...
...
@@ -306,7 +543,7 @@ void *rrc_gnb_task(void *args_p) {
int
result
;
//SRB_INFO *srb_info_p;
//int CC_id;
//
protocol_ctxt_t ctxt;
protocol_ctxt_t
ctxt
;
itti_mark_task_ready
(
TASK_RRC_GNB
);
LOG_I
(
NR_RRC
,
"Entering main loop of NR_RRC message task
\n
"
);
...
...
@@ -328,6 +565,30 @@ void *rrc_gnb_task(void *args_p) {
break
;
/* Messages from MAC */
case
NR_RRC_MAC_CCCH_DATA_IND
:
// PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt,
// NR_RRC_MAC_CCCH_DATA_IND(msg_p).gnb_index,
// ENB_FLAG_YES,
// NR_RRC_MAC_CCCH_DATA_IND(msg_p).rnti,
// msg_p->ittiMsgHeader.lte_time.frame,
// msg_p->ittiMsgHeader.lte_time.slot);
LOG_I
(
RRC
,
"Decoding CCCH : inst %d, CC_id %d, ctxt %p, sib_info_p->Rx_buffer.payload_size %d
\n
"
,
instance
,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
CC_id
,
&
ctxt
,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
sdu_size
);
if
(
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
sdu_size
>=
CCCH_SDU_SIZE
)
{
LOG_I
(
RRC
,
"CCCH message has size %d > %d
\n
"
,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
sdu_size
,
CCCH_SDU_SIZE
);
break
;
}
nr_rrc_eNB_decode_ccch
(
&
ctxt
,
(
uint8_t
*
)
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
sdu
,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
sdu_size
,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
CC_id
);
break
;
/* Messages from PDCP */
...
...
openair2/RRC/NR/rrc_gNB_UE_context.c
View file @
3f02d18f
...
...
@@ -220,4 +220,61 @@ void rrc_gNB_remove_ue_context(
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
));
}
//-----------------------------------------------------------------------------
// return the ue context if there is already an UE with ue_identityP, NULL otherwise
struct
rrc_gNB_ue_context_s
*
rrc_gNB_ue_context_random_exist
(
gNB_RRC_INST
*
rrc_instance_pP
,
const
uint64_t
ue_identityP
)
//-----------------------------------------------------------------------------
{
struct
rrc_gNB_ue_context_s
*
ue_context_p
=
NULL
;
RB_FOREACH
(
ue_context_p
,
rrc_nr_ue_tree_s
,
&
rrc_instance_pP
->
rrc_ue_head
)
{
if
(
ue_context_p
->
ue_context
.
random_ue_identity
==
ue_identityP
)
return
ue_context_p
;
}
return
NULL
;
}
//-----------------------------------------------------------------------------
// return a new ue context structure if ue_identityP, ctxt_pP->rnti not found in collection
struct
rrc_gNB_ue_context_s
*
rrc_gNB_get_next_free_ue_context
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
gNB_RRC_INST
*
rrc_instance_pP
,
const
uint64_t
ue_identityP
)
//-----------------------------------------------------------------------------
{
struct
rrc_gNB_ue_context_s
*
ue_context_p
=
NULL
;
ue_context_p
=
rrc_gNB_get_ue_context
(
rrc_instance_pP
,
ctxt_pP
->
rnti
);
if
(
ue_context_p
==
NULL
)
{
ue_context_p
=
rrc_gNB_allocate_new_UE_context
(
rrc_instance_pP
);
if
(
ue_context_p
==
NULL
)
{
LOG_E
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" Cannot create new UE context, no memory
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
));
return
NULL
;
}
ue_context_p
->
ue_id_rnti
=
ctxt_pP
->
rnti
;
// here ue_id_rnti is just a key, may be something else
ue_context_p
->
ue_context
.
rnti
=
ctxt_pP
->
rnti
;
// yes duplicate, 1 may be removed
ue_context_p
->
ue_context
.
random_ue_identity
=
ue_identityP
;
RB_INSERT
(
rrc_nr_ue_tree_s
,
&
rrc_instance_pP
->
rrc_ue_head
,
ue_context_p
);
LOG_D
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" Created new UE context uid %u
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
),
ue_context_p
->
local_uid
);
return
ue_context_p
;
}
else
{
LOG_E
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" Cannot create new UE context, already exist
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
));
return
NULL
;
}
return
(
ue_context_p
);
}
openair2/RRC/NR/rrc_gNB_UE_context.h
View file @
3f02d18f
...
...
@@ -73,10 +73,28 @@ rrc_gNB_get_ue_context(
rnti_t
rntiP
);
void
rrc_gNB_free_mem_UE_context
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
struct
rrc_gNB_ue_context_s
*
const
ue_context_pP
);
void
rrc_gNB_remove_ue_context
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
gNB_RRC_INST
*
rrc_instance_pP
,
struct
rrc_gNB_ue_context_s
*
ue_context_pP
);
struct
rrc_gNB_ue_context_s
*
rrc_gNB_ue_context_random_exist
(
gNB_RRC_INST
*
rrc_instance_pP
,
const
uint64_t
ue_identityP
);
struct
rrc_gNB_ue_context_s
*
rrc_gNB_get_next_free_ue_context
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
gNB_RRC_INST
*
rrc_instance_pP
,
const
uint64_t
ue_identityP
);
#endif
openair2/RRC/NR/rrc_gNB_reconfig.c
View file @
3f02d18f
...
...
@@ -168,7 +168,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
secondaryCellGroup
->
spCellConfig
->
rlf_TimersAndConstants
->
choice
.
setup
->
n310
=
NR_RLF_TimersAndConstants__n310_n10
;
secondaryCellGroup
->
spCellConfig
->
rlf_TimersAndConstants
->
choice
.
setup
->
n311
=
NR_RLF_TimersAndConstants__n311_n1
;
secondaryCellGroup
->
spCellConfig
->
rlf_TimersAndConstants
->
choice
.
setup
->
ext1
=
calloc
(
1
,
sizeof
(
*
secondaryCellGroup
->
spCellConfig
->
rlf_TimersAndConstants
->
choice
.
setup
->
ext1
));
secondaryCellGroup
->
spCellConfig
->
rlf_TimersAndConstants
->
choice
.
setup
->
ext1
->
t311
_v1530
=
NR_RLF_TimersAndConstants__ext1__t311_v1530
_ms30000
;
secondaryCellGroup
->
spCellConfig
->
rlf_TimersAndConstants
->
choice
.
setup
->
ext1
->
t311
=
NR_RLF_TimersAndConstants__ext1__t311
_ms30000
;
secondaryCellGroup
->
spCellConfig
->
rlmInSyncOutOfSyncThreshold
=
NULL
;
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
=
calloc
(
1
,
sizeof
(
*
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
));
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
tdd_UL_DL_ConfigurationDedicated
=
NULL
;
...
...
@@ -961,7 +961,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
ASN_SEQUENCE_ADD
(
&
pucchresset0
->
resourceList
.
list
,
pucchresset0id0
);
*
pucchresset0id1
=
2
;
ASN_SEQUENCE_ADD
(
&
pucchresset0
->
resourceList
.
list
,
pucchresset0id1
);
pucchresset0
->
maxPayload
Minus1
=
NULL
;
pucchresset0
->
maxPayload
Size
=
NULL
;
ASN_SEQUENCE_ADD
(
&
pucch_Config
->
resourceSetToAddModList
->
list
,
pucchresset0
);
...
...
@@ -972,7 +972,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
ASN_SEQUENCE_ADD
(
&
pucchresset1
->
resourceList
.
list
,
pucchresset1id0
);
*
pucchresset1id1
=
4
;
ASN_SEQUENCE_ADD
(
&
pucchresset1
->
resourceList
.
list
,
pucchresset1id1
);
pucchresset1
->
maxPayload
Minus1
=
NULL
;
pucchresset1
->
maxPayload
Size
=
NULL
;
ASN_SEQUENCE_ADD
(
&
pucch_Config
->
resourceSetToAddModList
->
list
,
pucchresset1
);
pucch_Config
->
resourceToAddModList
=
calloc
(
1
,
sizeof
(
*
pucch_Config
->
resourceToAddModList
));
...
...
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