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
littleBu
OpenXG-RAN
Commits
ec48bb89
Commit
ec48bb89
authored
4 years ago
by
heshanyun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
implement rrcReestablishmentComplete
parent
547d7b01
Branches unavailable
2025.w08
2025.w07
2025.w06
2025.w05
2025.w04
2025.w03
2025.w02
2024.w51
2024.w50
2024.w49
2024.w48
2024.w47
2024.w46
2024.w45
2024.w44
2024.w43
2024.w42
2024.w41
2024.w40
2024.w39
2024.w38
2024.w36
2024.w35
2024.w34
2024.w33
2024.w32
2024.w31
2024.w30
2024.w29
2024.w28
2024.w27
2024.w26
2024.w25
2024.w24
2024.w23
2024.w22
2024.w21
2024.w18
2024.w17
2024.w16
2024.w15
2024.w14
2024.w13
2024.w12
2024.w11
2024.w10
2024.w09
2024.w08
2024.w06
2024.w05
2024.w04
2024.w03
2024.w02
2024.w01
2023.w51
2023.w50
2023.w49
2023.w48
2023.w47
2023.w45
2023.w43
2023.w42
2023.w41
2023.w40
2023.w39
2023.w38
2023.w37
2023.w36
2023.w34
2023.w33
2023.w32
2023.w31
2023.w30
2023.w29
2023.w28
2023.w27
2023.w26
2023.w25
2023.w24
2023.w23
2023.w22
2023.w21
2023.w20
2023.w19
2023.w18
2023.w18b
2023.w16
2023.w15
2023.w14
2023.w13
2023.w12
2023.w11
2023.w11b
2023.w10
2023.w10b
2023.w09
2023.w08
2023.w08b
2023.w07
2023.w06
2023.w05
2023.w03
2023.w02
2022.42
2022.41
2022.w51
2022.w50
2022.w49
2022.w48
2022.w47
2022.w46
2022.w45
2022.w43
2022.w42
2022.w42b
2022.w41
2022.w40
2022.w39
2022.w38
2022.w37
2022.w37b
2022.w36
2022.w35
2022.w33
2022.w32
2022.w31
2022.w31b
2022.w30
2022.w29
2022.w26
2022.w25
2022.w24
2022.w24b
2022.w23
2022.w22
2022.w21
2022.w20
2022.w19
2022.w18
2022.w17
2022.w15
2022.w15b
2022.w14a
2022.w13
2022.w13b
2022.w13a
2022.w12
2022.w10
2022.w09
2022.w09b
2022.w08
2022.w08b
2022.w07
2022.w07b
2022.w06
2022.w06a
2022.w05
2022.w05b
2022.w03_hotfix
2022.w03_b
2022.w02
2022.w01
2021.wk46
2021.wk14_a
2021.wk13_d
2021.wk13_c
2021.w51_c
2021.w51_a
2021.w50_a
2021.w49_b
2021.w49_a
2021.w48
2021.w47
2021.w46
2021.w46-powder
2021.w45
2021.w45_b
2021.w44
2021.w43
2021.w42
2021.w37
2021.w36
2021.w35
2021.w34
2021.w33
2021.w32
2021.w31
2021.w30
2021.w29
2021.w28
2021.w27
2021.w26
2021.w25
2021.w24
2021.w23
2021.w22
2021.w20
2021.w19
2021.w18_b
2021.w18_a
2021.w17_b
2021.w16
2021.w15
2021.w14
2021.w13_a
2021.w12
2021.w11
2021.w10
2021.w09
2021.w08
2021.w06
2021.w05
v2.2.0
v2.1.0
v2.0.0
setparam
flexran-eol
benetel_gnb_rel_2.0
benetel_gnb_rel_1.0
benetel_enb_rel_2.0
benetel_enb_rel_1.0
ARC_1.3
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
424 additions
and
0 deletions
+424
-0
openair2/RRC/NR/nr_rrc_defs.h
openair2/RRC/NR/nr_rrc_defs.h
+2
-0
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+318
-0
openair2/RRC/NR/rrc_gNB_NGAP.h
openair2/RRC/NR/rrc_gNB_NGAP.h
+7
-0
openair3/GTPV1-U/gtpv1u_gNB.c
openair3/GTPV1-U/gtpv1u_gNB.c
+90
-0
openair3/GTPV1-U/gtpv1u_gNB_task.h
openair3/GTPV1-U/gtpv1u_gNB_task.h
+7
-0
No files found.
openair2/RRC/NR/nr_rrc_defs.h
View file @
ec48bb89
...
...
@@ -379,6 +379,8 @@ typedef struct gNB_RRC_UE_s {
uint32_t
ue_reestablishment_timer_thres
;
uint8_t
e_rab_release_command_flag
;
uint8_t
pdu_session_release_command_flag
;
uint32_t
ue_rrc_inactivity_timer
;
int8_t
reestablishment_xid
;
//------------------------------------------------------------------------------//
NR_CellGroupId_t
cellGroupId
;
struct
NR_SpCellConfig
*
spCellConfig
;
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/rrc_gNB.c
View file @
ec48bb89
...
...
@@ -906,6 +906,253 @@ rrc_gNB_process_RRCReconfigurationComplete(
ue_context_pP
->
ue_context
.
DRB_Release_configList2
[
xid
]
=
NULL
;
}
}
//-----------------------------------------------------------------------------
void
rrc_gNB_process_RRCConnectionReestablishmentComplete
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
const
rnti_t
reestablish_rnti
,
rrc_gNB_ue_context_t
*
ue_context_pP
,
const
uint8_t
xid
)
//-----------------------------------------------------------------------------
{
LOG_I
(
NR_RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" [RAPROC] Logical Channel UL-DCCH, processing NR_RRCConnectionReestablishmentComplete from UE (SRB1 Active)
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
));
NR_DRB_ToAddModList_t
*
DRB_configList
=
ue_context_pP
->
ue_context
.
DRB_configList
;
NR_SRB_ToAddModList_t
*
SRB_configList
=
ue_context_pP
->
ue_context
.
SRB_configList
;
NR_SRB_ToAddModList_t
**
SRB_configList2
=
NULL
;
NR_DRB_ToAddModList_t
**
DRB_configList2
=
NULL
;
NR_SRB_ToAddMod_t
*
SRB2_config
=
NULL
;
NR_DRB_ToAddMod_t
*
DRB_config
=
NULL
;
//NR_SDAP_Config_t *sdap_config = NULL;
int
i
=
0
;
uint8_t
buffer
[
RRC_BUF_SIZE
];
uint16_t
size
;
uint8_t
next_xid
=
rrc_gNB_get_next_transaction_identifier
(
ctxt_pP
->
module_id
);
int
ret
=
0
;
ue_context_pP
->
ue_context
.
Status
=
RRC_CONNECTED
;
ue_context_pP
->
ue_context
.
ue_rrc_inactivity_timer
=
1
;
// set rrc inactivity when UE goes into RRC_CONNECTED
ue_context_pP
->
ue_context
.
reestablishment_xid
=
next_xid
;
SRB_configList2
=
&
ue_context_pP
->
ue_context
.
SRB_configList2
[
xid
];
// get old configuration of SRB2
if
(
*
SRB_configList2
!=
NULL
)
{
if
((
*
SRB_configList2
)
->
list
.
count
!=
0
)
{
LOG_D
(
NR_RRC
,
"SRB_configList2(%p) count is %d
\n
SRB_configList2->list.array[0] addr is %p"
,
SRB_configList2
,
(
*
SRB_configList2
)
->
list
.
count
,
(
*
SRB_configList2
)
->
list
.
array
[
0
]);
}
for
(
i
=
0
;
(
i
<
(
*
SRB_configList2
)
->
list
.
count
)
&&
(
i
<
3
);
i
++
)
{
if
((
*
SRB_configList2
)
->
list
.
array
[
i
]
->
srb_Identity
==
2
)
{
LOG_D
(
NR_RRC
,
"get SRB2_config from (ue_context_pP->ue_context.SRB_configList2[%d])
\n
"
,
xid
);
SRB2_config
=
(
*
SRB_configList2
)
->
list
.
array
[
i
];
break
;
}
}
}
SRB_configList2
=
&
(
ue_context_pP
->
ue_context
.
SRB_configList2
[
next_xid
]);
DRB_configList2
=
&
(
ue_context_pP
->
ue_context
.
DRB_configList2
[
next_xid
]);
if
(
*
SRB_configList2
)
{
free
(
*
SRB_configList2
);
LOG_D
(
NR_RRC
,
"free(ue_context_pP->ue_context.SRB_configList2[%d])
\n
"
,
next_xid
);
}
*
SRB_configList2
=
CALLOC
(
1
,
sizeof
(
**
SRB_configList2
));
if
(
SRB2_config
!=
NULL
)
{
// Add SRB2 to SRB configuration list
ASN_SEQUENCE_ADD
(
&
SRB_configList
->
list
,
SRB2_config
);
ASN_SEQUENCE_ADD
(
&
(
*
SRB_configList2
)
->
list
,
SRB2_config
);
LOG_D
(
NR_RRC
,
"Add SRB2_config (srb_Identity:%ld) to ue_context_pP->ue_context.SRB_configList
\n
"
,
SRB2_config
->
srb_Identity
);
LOG_D
(
NR_RRC
,
"Add SRB2_config (srb_Identity:%ld) to ue_context_pP->ue_context.SRB_configList2[%d]
\n
"
,
SRB2_config
->
srb_Identity
,
next_xid
);
}
else
{
// SRB configuration list only contains SRB1.
LOG_W
(
NR_RRC
,
"SRB2 configuration does not exist in SRB configuration list
\n
"
);
}
if
(
*
DRB_configList2
)
{
free
(
*
DRB_configList2
);
LOG_D
(
NR_RRC
,
"free(ue_context_pP->ue_context.DRB_configList2[%d])
\n
"
,
next_xid
);
}
*
DRB_configList2
=
CALLOC
(
1
,
sizeof
(
**
DRB_configList2
));
if
(
DRB_configList
!=
NULL
)
{
LOG_D
(
NR_RRC
,
"get DRB_config from (ue_context_pP->ue_context.DRB_configList)
\n
"
);
for
(
i
=
0
;
(
i
<
DRB_configList
->
list
.
count
)
&&
(
i
<
3
);
i
++
)
{
DRB_config
=
DRB_configList
->
list
.
array
[
i
];
// Add DRB to DRB configuration list, for LTE_RRCConnectionReconfigurationComplete
ASN_SEQUENCE_ADD
(
&
(
*
DRB_configList2
)
->
list
,
DRB_config
);
}
}
ue_context_pP
->
ue_context
.
Srb1
.
Active
=
1
;
//ue_context_pP->ue_context.Srb2.Srb_info.Srb_id = 2;
if
(
AMF_MODE_ENABLED
)
{
hashtable_rc_t
h_rc
;
int
j
;
rrc_ue_ngap_ids_t
*
rrc_ue_ngap_ids_p
=
NULL
;
uint16_t
ue_initial_id
=
ue_context_pP
->
ue_context
.
ue_initial_id
;
uint32_t
gNB_ue_ngap_id
=
ue_context_pP
->
ue_context
.
gNB_ue_ngap_id
;
gNB_RRC_INST
*
rrc_instance_p
=
RC
.
nrrrc
[
GNB_INSTANCE_TO_MODULE_ID
(
ctxt_pP
->
instance
)];
if
(
gNB_ue_ngap_id
>
0
)
{
h_rc
=
hashtable_get
(
rrc_instance_p
->
ngap_id2_ngap_ids
,
(
hash_key_t
)
gNB_ue_ngap_id
,
(
void
**
)
&
rrc_ue_ngap_ids_p
);
if
(
h_rc
==
HASH_TABLE_OK
)
{
rrc_ue_ngap_ids_p
->
ue_rnti
=
ctxt_pP
->
rnti
;
}
}
if
(
ue_initial_id
!=
0
)
{
h_rc
=
hashtable_get
(
rrc_instance_p
->
initial_id2_ngap_ids
,
(
hash_key_t
)
ue_initial_id
,
(
void
**
)
&
rrc_ue_ngap_ids_p
);
if
(
h_rc
==
HASH_TABLE_OK
)
{
rrc_ue_ngap_ids_p
->
ue_rnti
=
ctxt_pP
->
rnti
;
}
}
gtpv1u_gnb_create_tunnel_req_t
create_tunnel_req
;
/* Save e RAB information for later */
memset
(
&
create_tunnel_req
,
0
,
sizeof
(
create_tunnel_req
));
for
(
j
=
0
,
i
=
0
;
i
<
NB_RB_MAX
;
i
++
)
{
if
(
ue_context_pP
->
ue_context
.
pdusession
[
i
].
status
==
PDU_SESSION_STATUS_ESTABLISHED
||
ue_context_pP
->
ue_context
.
pdusession
[
i
].
status
==
PDU_SESSION_STATUS_DONE
)
{
create_tunnel_req
.
pdusession_id
[
j
]
=
ue_context_pP
->
ue_context
.
pdusession
[
i
].
param
.
pdusession_id
;
create_tunnel_req
.
upf_NGu_teid
[
j
]
=
ue_context_pP
->
ue_context
.
pdusession
[
i
].
param
.
gtp_teid
;
memcpy
(
create_tunnel_req
.
upf_addr
[
j
].
buffer
,
ue_context_pP
->
ue_context
.
pdusession
[
i
].
param
.
upf_addr
.
buffer
,
sizeof
(
uint8_t
)
*
20
);
create_tunnel_req
.
upf_addr
[
j
].
length
=
ue_context_pP
->
ue_context
.
pdusession
[
i
].
param
.
upf_addr
.
length
;
j
++
;
}
}
create_tunnel_req
.
rnti
=
ctxt_pP
->
rnti
;
// warning put zero above
create_tunnel_req
.
num_tunnels
=
j
;
ret
=
gtpv1u_update_ngu_tunnel
(
ctxt_pP
->
instance
,
&
create_tunnel_req
,
reestablish_rnti
);
if
(
ret
!=
0
)
{
LOG_E
(
RRC
,
"gtpv1u_update_ngu_tunnel failed,start to release UE %x
\n
"
,
reestablish_rnti
);
// update s1u tunnel failed,reset rnti?
if
(
gNB_ue_ngap_id
>
0
)
{
h_rc
=
hashtable_get
(
rrc_instance_p
->
ngap_id2_ngap_ids
,
(
hash_key_t
)
gNB_ue_ngap_id
,
(
void
**
)
&
rrc_ue_ngap_ids_p
);
if
(
h_rc
==
HASH_TABLE_OK
)
{
rrc_ue_ngap_ids_p
->
ue_rnti
=
reestablish_rnti
;
}
}
if
(
ue_initial_id
!=
0
)
{
h_rc
=
hashtable_get
(
rrc_instance_p
->
initial_id2_ngap_ids
,
(
hash_key_t
)
ue_initial_id
,
(
void
**
)
&
rrc_ue_ngap_ids_p
);
if
(
h_rc
==
HASH_TABLE_OK
)
{
rrc_ue_ngap_ids_p
->
ue_rnti
=
reestablish_rnti
;
}
}
ue_context_pP
->
ue_context
.
ue_release_timer_s1
=
1
;
ue_context_pP
->
ue_context
.
ue_release_timer_thres_s1
=
100
;
ue_context_pP
->
ue_context
.
ue_release_timer
=
0
;
ue_context_pP
->
ue_context
.
ue_reestablishment_timer
=
0
;
ue_context_pP
->
ue_context
.
ul_failure_timer
=
20000
;
// set ul_failure to 20000 for triggering rrc_eNB_send_S1AP_UE_CONTEXT_RELEASE_REQ
ue_context_pP
->
ue_context
.
ul_failure_timer
=
0
;
return
;
}
}
/* AMF_MODE_ENABLED */
/* Update RNTI in ue_context */
ue_context_pP
->
ue_id_rnti
=
ctxt_pP
->
rnti
;
// here ue_id_rnti is just a key, may be something else
ue_context_pP
->
ue_context
.
rnti
=
ctxt_pP
->
rnti
;
if
(
AMF_MODE_ENABLED
)
{
uint8_t
send_security_mode_command
=
FALSE
;
nr_rrc_pdcp_config_security
(
ctxt_pP
,
ue_context_pP
,
send_security_mode_command
);
LOG_D
(
NR_RRC
,
"set security successfully
\n
"
);
}
/* Add all NAS PDUs to the list */
for
(
i
=
0
;
i
<
ue_context_pP
->
ue_context
.
nb_of_pdusessions
;
i
++
)
{
/* TODO parameters yet to process ... */
/* TODO should test if pdu session are Ok before! */
ue_context_pP
->
ue_context
.
pdusession
[
i
].
status
=
PDU_SESSION_STATUS_DONE
;
ue_context_pP
->
ue_context
.
pdusession
[
i
].
xid
=
xid
;
LOG_D
(
NR_RRC
,
"setting the status for the default DRB (index %d) to (%d,%s)
\n
"
,
i
,
ue_context_pP
->
ue_context
.
pdusession
[
i
].
status
,
"PDU_SESSION_STATUS_DONE"
);
}
memset
(
buffer
,
0
,
RRC_BUF_SIZE
);
size
=
do_RRCReconfiguration
(
ctxt_pP
,
buffer
,
xid
,
*
SRB_configList2
,
DRB_configList
,
NULL
,
NULL
,
NULL
,
NULL
,
// MeasObj_list,
NULL
,
NULL
);
LOG_DUMPMSG
(
NR_RRC
,
DEBUG_RRC
,(
char
*
)
buffer
,
size
,
"[MSG] RRC Connection Reconfiguration
\n
"
);
/* Free all NAS PDUs */
for
(
i
=
0
;
i
<
ue_context_pP
->
ue_context
.
nb_of_pdusessions
;
i
++
)
{
if
(
ue_context_pP
->
ue_context
.
pdusession
[
i
].
param
.
nas_pdu
.
buffer
!=
NULL
)
{
/* Free the NAS PDU buffer and invalidate it */
free
(
ue_context_pP
->
ue_context
.
pdusession
[
i
].
param
.
nas_pdu
.
buffer
);
ue_context_pP
->
ue_context
.
pdusession
[
i
].
param
.
nas_pdu
.
buffer
=
NULL
;
}
}
if
(
size
==
65535
)
{
LOG_E
(
NR_RRC
,
"RRC decode err!!! do_RRCConnectionReconfiguration
\n
"
);
return
;
}
else
{
LOG_I
(
NR_RRC
,
"[gNB %d] Frame %d, Logical Channel DL-DCCH, Generate NR_RRCConnectionReconfiguration (bytes %d, UE id %x)
\n
"
,
ctxt_pP
->
module_id
,
ctxt_pP
->
frame
,
size
,
ue_context_pP
->
ue_context
.
rnti
);
LOG_D
(
NR_RRC
,
"[FRAME %05d][RRC_gNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]
\n
"
,
ctxt_pP
->
frame
,
ctxt_pP
->
module_id
,
size
,
ue_context_pP
->
ue_context
.
rnti
,
rrc_gNB_mui
,
ctxt_pP
->
module_id
,
DCCH
);
MSC_LOG_TX_MESSAGE
(
MSC_RRC_GNB
,
MSC_RRC_UE
,
buffer
,
size
,
MSC_AS_TIME_FMT
" LTE_RRCConnectionReconfiguration UE %x MUI %d size %u"
,
MSC_AS_TIME_ARGS
(
ctxt_pP
),
ue_context_pP
->
ue_context
.
rnti
,
rrc_gNB_mui
,
size
);
nr_rrc_data_req
(
ctxt_pP
,
DCCH
,
rrc_gNB_mui
++
,
SDU_CONFIRM_NO
,
size
,
buffer
,
PDCP_TRANSMISSION_MODE_CONTROL
);
}
}
//-----------------------------------------------------------------------------
/*------------------------------------------------------------------------------*/
...
...
@@ -1522,6 +1769,77 @@ rrc_gNB_decode_dcch(
rrc_gNB_generate_defaultRRCReconfiguration
(
ctxt_pP
,
ue_context_p
);
break
;
case
NR_UL_DCCH_MessageType__c1_PR_rrcReestablishmentComplete
:
LOG_DUMPMSG
(
NR_RRC
,
DEBUG_RRC
,(
char
*
)
Rx_sdu
,
sdu_sizeP
,
"[MSG] NR_RRC Connection Reestablishment Complete
\n
"
);
MSC_LOG_RX_MESSAGE
(
MSC_RRC_GNB
,
MSC_RRC_UE
,
Rx_sdu
,
sdu_sizeP
,
MSC_AS_TIME_FMT
" NR_RRCConnectionReestablishmentComplete UE %x size %u"
,
MSC_AS_TIME_ARGS
(
ctxt_pP
),
ue_context_p
->
ue_context
.
rnti
,
sdu_sizeP
);
LOG_I
(
NR_RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" RLC RB %02d --- RLC_DATA_IND %d bytes "
"(rrcConnectionReestablishmentComplete) ---> RRC_gNB
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
),
DCCH
,
sdu_sizeP
);
{
rnti_t
reestablish_rnti
=
0
;
// select C-RNTI from map
for
(
i
=
0
;
i
<
MAX_MOBILES_PER_ENB
;
i
++
)
{
if
(
reestablish_rnti_map
[
i
][
0
]
==
ctxt_pP
->
rnti
)
{
reestablish_rnti
=
reestablish_rnti_map
[
i
][
1
];
ue_context_p
=
rrc_gNB_get_ue_context
(
RC
.
nrrrc
[
ctxt_pP
->
module_id
],
reestablish_rnti
);
// clear currentC-RNTI from map
reestablish_rnti_map
[
i
][
0
]
=
0
;
reestablish_rnti_map
[
i
][
1
]
=
0
;
LOG_D
(
NR_RRC
,
"reestablish_rnti_map[%d] [0] %x, [1] %x
\n
"
,
i
,
reestablish_rnti_map
[
i
][
0
],
reestablish_rnti_map
[
i
][
1
]);
break
;
}
}
if
(
!
ue_context_p
)
{
LOG_E
(
NR_RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" NR_RRCConnectionReestablishmentComplete without UE context, falt
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
));
break
;
}
//clear
int
UE_id
=
find_UE_id
(
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
);
if
(
UE_id
==
-
1
)
{
LOG_E
(
NR_RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" NR_RRCConnectionReestablishmentComplete without UE_id(MAC) rnti %x, fault
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
),
ctxt_pP
->
rnti
);
break
;
}
RC
.
mac
[
ctxt_pP
->
module_id
]
->
UE_info
.
UE_sched_ctrl
[
UE_id
].
ue_reestablishment_reject_timer
=
0
;
ue_context_p
->
ue_context
.
reestablishment_xid
=
-
1
;
if
(
ul_dcch_msg
->
message
.
choice
.
c1
->
choice
.
rrcReestablishmentComplete
->
criticalExtensions
.
present
==
NR_RRCReestablishmentComplete__criticalExtensions_PR_rrcReestablishmentComplete
)
{
rrc_gNB_process_RRCConnectionReestablishmentComplete
(
ctxt_pP
,
reestablish_rnti
,
ue_context_p
,
ul_dcch_msg
->
message
.
choice
.
c1
->
choice
.
rrcReestablishmentComplete
->
rrc_TransactionIdentifier
);
}
//ue_context_p->ue_context.ue_release_timer = 0;
ue_context_p
->
ue_context
.
ue_reestablishment_timer
=
1
;
// remove UE after 100 frames after LTE_RRCConnectionReestablishmentRelease is triggered
ue_context_p
->
ue_context
.
ue_reestablishment_timer_thres
=
1000
;
}
break
;
default:
break
;
}
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/rrc_gNB_NGAP.h
View file @
ec48bb89
...
...
@@ -156,4 +156,11 @@ rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE(
uint8_t
xid
);
void
nr_rrc_pdcp_config_security
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
rrc_gNB_ue_context_t
*
const
ue_context_pP
,
const
uint8_t
send_security_mode_command
);
#endif
This diff is collapsed.
Click to expand it.
openair3/GTPV1-U/gtpv1u_gNB.c
View file @
ec48bb89
...
...
@@ -551,6 +551,96 @@ gtpv1u_create_ngu_tunnel(
return
ret
;
}
int
gtpv1u_update_ngu_tunnel
(
const
instance_t
instanceP
,
const
gtpv1u_gnb_create_tunnel_req_t
*
const
create_tunnel_req_pP
,
const
rnti_t
prior_rnti
)
{
/* Local tunnel end-point identifier */
teid_t
ngu_teid
=
0
;
nr_gtpv1u_teid_data_t
*
gtpv1u_teid_data_p
=
NULL
;
nr_gtpv1u_ue_data_t
*
gtpv1u_ue_data_p
=
NULL
;
nr_gtpv1u_ue_data_t
*
gtpv1u_ue_data_new_p
=
NULL
;
//MessageDef *message_p = NULL;
hashtable_rc_t
hash_rc
=
HASH_TABLE_KEY_NOT_EXISTS
;
int
i
,
j
;
uint8_t
bearers_num
=
0
,
bearers_total
=
0
;
//-----------------------
// PDCP->GTPV1U mapping
//-----------------------
hash_rc
=
hashtable_get
(
RC
.
nr_gtpv1u_data_g
->
ue_mapping
,
prior_rnti
,
(
void
**
)
&
gtpv1u_ue_data_p
);
if
(
hash_rc
!=
HASH_TABLE_OK
)
{
LOG_E
(
GTPU
,
"Error get ue_mapping(rnti=%x) from GTPV1U hashtable error
\n
"
,
prior_rnti
);
return
-
1
;
}
gtpv1u_ue_data_new_p
=
calloc
(
1
,
sizeof
(
nr_gtpv1u_ue_data_t
));
memcpy
(
gtpv1u_ue_data_new_p
,
gtpv1u_ue_data_p
,
sizeof
(
nr_gtpv1u_ue_data_t
));
gtpv1u_ue_data_new_p
->
ue_id
=
create_tunnel_req_pP
->
rnti
;
hash_rc
=
hashtable_insert
(
RC
.
nr_gtpv1u_data_g
->
ue_mapping
,
create_tunnel_req_pP
->
rnti
,
gtpv1u_ue_data_new_p
);
//AssertFatal(hash_rc == HASH_TABLE_OK, "Error inserting ue_mapping in GTPV1U hashtable");
if
(
hash_rc
!=
HASH_TABLE_OK
)
{
LOG_E
(
GTPU
,
"Failed to insert ue_mapping(rnti=%x) in GTPV1U hashtable
\n
"
,
create_tunnel_req_pP
->
rnti
);
return
-
1
;
}
else
{
LOG_I
(
GTPU
,
"inserting ue_mapping(rnti=%x) in GTPV1U hashtable
\n
"
,
create_tunnel_req_pP
->
rnti
);
}
hash_rc
=
hashtable_remove
(
RC
.
nr_gtpv1u_data_g
->
ue_mapping
,
prior_rnti
);
LOG_I
(
GTPU
,
"hashtable_remove ue_mapping(rnti=%x) in GTPV1U hashtable
\n
"
,
prior_rnti
);
//-----------------------
// GTPV1U->PDCP mapping
//-----------------------
bearers_total
=
gtpv1u_ue_data_new_p
->
num_bearers
;
for
(
j
=
0
;
j
<
GTPV1U_MAX_BEARERS_ID
;
j
++
)
{
if
(
gtpv1u_ue_data_new_p
->
bearers
[
j
].
state
!=
BEARER_IN_CONFIG
)
continue
;
bearers_num
++
;
for
(
i
=
0
;
i
<
create_tunnel_req_pP
->
num_tunnels
;
i
++
)
{
if
(
j
==
(
create_tunnel_req_pP
->
pdusession_id
[
i
]
-
GTPV1U_BEARER_OFFSET
))
break
;
}
if
(
i
<
create_tunnel_req_pP
->
num_tunnels
)
{
ngu_teid
=
gtpv1u_ue_data_new_p
->
bearers
[
j
].
teid_gNB
;
hash_rc
=
hashtable_get
(
RC
.
nr_gtpv1u_data_g
->
teid_mapping
,
ngu_teid
,
(
void
**
)
&
gtpv1u_teid_data_p
);
if
(
hash_rc
==
HASH_TABLE_OK
)
{
gtpv1u_teid_data_p
->
ue_id
=
create_tunnel_req_pP
->
rnti
;
gtpv1u_teid_data_p
->
pdu_session_id
=
create_tunnel_req_pP
->
pdusession_id
[
i
];
LOG_I
(
GTPU
,
"updata teid_mapping te_id %u (prior_rnti %x rnti %x) in GTPV1U hashtable
\n
"
,
ngu_teid
,
prior_rnti
,
create_tunnel_req_pP
->
rnti
);
}
else
{
LOG_W
(
GTPU
,
"Error get teid mapping(s1u_teid=%u) from GTPV1U hashtable"
,
ngu_teid
);
}
}
else
{
ngu_teid
=
gtpv1u_ue_data_new_p
->
bearers
[
j
].
teid_gNB
;
hash_rc
=
hashtable_remove
(
RC
.
nr_gtpv1u_data_g
->
teid_mapping
,
ngu_teid
);
if
(
hash_rc
!=
HASH_TABLE_OK
)
{
LOG_D
(
GTPU
,
"Removed user rnti %x , enb S1U teid %u not found
\n
"
,
prior_rnti
,
ngu_teid
);
}
gtpv1u_ue_data_new_p
->
bearers
[
j
].
state
=
BEARER_DOWN
;
gtpv1u_ue_data_new_p
->
num_bearers
--
;
LOG_I
(
GTPU
,
"delete teid_mapping te_id %u (rnti%x) bearer_id %d in GTPV1U hashtable
\n
"
,
ngu_teid
,
prior_rnti
,
j
+
GTPV1U_BEARER_OFFSET
);;
}
if
(
bearers_num
>
bearers_total
)
break
;
}
return
0
;
}
//-----------------------------------------------------------------------------
int
gtpv1u_delete_ngu_tunnel
(
const
instance_t
instanceP
,
...
...
This diff is collapsed.
Click to expand it.
openair3/GTPV1-U/gtpv1u_gNB_task.h
View file @
ec48bb89
...
...
@@ -40,5 +40,12 @@ gtpv1u_create_ngu_tunnel(
const
gtpv1u_gnb_create_tunnel_req_t
*
const
create_tunnel_req_pP
,
gtpv1u_gnb_create_tunnel_resp_t
*
const
create_tunnel_resp_pP
);
int
gtpv1u_update_ngu_tunnel
(
const
instance_t
instanceP
,
const
gtpv1u_gnb_create_tunnel_req_t
*
const
create_tunnel_req_pP
,
const
rnti_t
prior_rnti
);
#endif
/* GTPV1U_GNB_TASK_H_ */
This diff is collapsed.
Click to expand it.
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