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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
01b240eb
Commit
01b240eb
authored
6 months ago
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup rrc_gNB_generate_dedicatedRRCReconfiguration(): pass UE context directly
parent
452ccc32
Branches unavailable
2025.w14
2025.w13
2025.w12
2025.w11
2025.w10
2025.w09
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
v2.2.0
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
29 deletions
+5
-29
executables/nr-cuup.c
executables/nr-cuup.c
+0
-5
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/nr_rrc_proto.h
+0
-2
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+5
-22
No files found.
executables/nr-cuup.c
View file @
01b240eb
...
@@ -123,11 +123,6 @@ int nr_rlc_get_available_tx_space(const rnti_t rntiP, const logical_chan_id_t ch
...
@@ -123,11 +123,6 @@ int nr_rlc_get_available_tx_space(const rnti_t rntiP, const logical_chan_id_t ch
return
0
;
return
0
;
}
}
void
rrc_gNB_generate_dedicatedRRCReconfiguration
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
rrc_gNB_ue_context_t
*
ue_context_pP
)
{
abort
();
}
void
nr_rlc_add_drb
(
int
rnti
,
int
drb_id
,
const
NR_RLC_BearerConfig_t
*
rlc_BearerConfig
)
void
nr_rlc_add_drb
(
int
rnti
,
int
drb_id
,
const
NR_RLC_BearerConfig_t
*
rlc_BearerConfig
)
{
{
abort
();
abort
();
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/nr_rrc_proto.h
View file @
01b240eb
...
@@ -87,8 +87,6 @@ void rrc_gNB_generate_dedicatedRRCReconfiguration_release(gNB_RRC_INST *rrc,
...
@@ -87,8 +87,6 @@ void rrc_gNB_generate_dedicatedRRCReconfiguration_release(gNB_RRC_INST *rrc,
uint32_t
nas_length
,
uint32_t
nas_length
,
uint8_t
*
nas_buffer
);
uint8_t
*
nas_buffer
);
void
rrc_gNB_generate_dedicatedRRCReconfiguration
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
rrc_gNB_ue_context_t
*
ue_context_pP
);
bool
ue_associated_to_cuup
(
const
gNB_RRC_INST
*
rrc
,
const
gNB_RRC_UE_t
*
ue
);
bool
ue_associated_to_cuup
(
const
gNB_RRC_INST
*
rrc
,
const
gNB_RRC_UE_t
*
ue
);
sctp_assoc_t
get_existing_cuup_for_ue
(
const
gNB_RRC_INST
*
rrc
,
const
gNB_RRC_UE_t
*
ue
);
sctp_assoc_t
get_existing_cuup_for_ue
(
const
gNB_RRC_INST
*
rrc
,
const
gNB_RRC_UE_t
*
ue
);
sctp_assoc_t
get_new_cuup_for_ue
(
const
gNB_RRC_INST
*
rrc
,
const
gNB_RRC_UE_t
*
ue
,
int
sst
,
int
sd
);
sctp_assoc_t
get_new_cuup_for_ue
(
const
gNB_RRC_INST
*
rrc
,
const
gNB_RRC_UE_t
*
ue
,
int
sst
,
int
sd
);
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/rrc_gNB.c
View file @
01b240eb
...
@@ -481,14 +481,9 @@ static void rrc_gNB_process_RRCSetupComplete(gNB_RRC_INST *rrc, gNB_RRC_UE_t *UE
...
@@ -481,14 +481,9 @@ static void rrc_gNB_process_RRCSetupComplete(gNB_RRC_INST *rrc, gNB_RRC_UE_t *UE
rrc_gNB_send_NGAP_NAS_FIRST_REQ
(
rrc
,
UE
,
rrcSetupComplete
);
rrc_gNB_send_NGAP_NAS_FIRST_REQ
(
rrc
,
UE
,
rrcSetupComplete
);
}
}
//-----------------------------------------------------------------------------
static
void
rrc_gNB_generate_dedicatedRRCReconfiguration
(
gNB_RRC_INST
*
rrc
,
gNB_RRC_UE_t
*
ue_p
)
void
rrc_gNB_generate_dedicatedRRCReconfiguration
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
rrc_gNB_ue_context_t
*
ue_context_pP
)
//-----------------------------------------------------------------------------
{
{
gNB_RRC_INST
*
rrc
=
RC
.
nrrrc
[
ctxt_pP
->
module_id
];
uint8_t
xid
=
rrc_gNB_get_next_transaction_identifier
(
rrc
->
module_id
);
uint8_t
xid
=
rrc_gNB_get_next_transaction_identifier
(
ctxt_pP
->
module_id
);
gNB_RRC_UE_t
*
ue_p
=
&
ue_context_pP
->
ue_context
;
ue_p
->
xids
[
xid
]
=
RRC_PDUSESSION_ESTABLISH
;
ue_p
->
xids
[
xid
]
=
RRC_PDUSESSION_ESTABLISH
;
struct
NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList
*
dedicatedNAS_MessageList
=
CALLOC
(
1
,
sizeof
(
*
dedicatedNAS_MessageList
));
struct
NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList
*
dedicatedNAS_MessageList
=
CALLOC
(
1
,
sizeof
(
*
dedicatedNAS_MessageList
));
...
@@ -569,16 +564,6 @@ void rrc_gNB_generate_dedicatedRRCReconfiguration(const protocol_ctxt_t *const c
...
@@ -569,16 +564,6 @@ void rrc_gNB_generate_dedicatedRRCReconfiguration(const protocol_ctxt_t *const c
ue_p
->
DRB_ReleaseList
=
NULL
;
ue_p
->
DRB_ReleaseList
=
NULL
;
LOG_I
(
NR_RRC
,
"UE %d: Generate RRCReconfiguration (bytes %d, xid %d)
\n
"
,
ue_p
->
rrc_ue_id
,
size
,
xid
);
LOG_I
(
NR_RRC
,
"UE %d: Generate RRCReconfiguration (bytes %d, xid %d)
\n
"
,
ue_p
->
rrc_ue_id
,
size
,
xid
);
LOG_D
(
NR_RRC
,
"[FRAME %05d][RRC_gNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]
\n
"
,
ctxt_pP
->
frame
,
ctxt_pP
->
module_id
,
size
,
ue_p
->
rnti
,
rrc_gNB_mui
,
ctxt_pP
->
module_id
,
DCCH
);
nr_rrc_transfer_protected_rrc_message
(
rrc
,
ue_p
,
DCCH
,
buffer
,
size
);
nr_rrc_transfer_protected_rrc_message
(
rrc
,
ue_p
,
DCCH
,
buffer
,
size
);
}
}
...
@@ -1877,8 +1862,7 @@ static void rrc_CU_process_ue_context_setup_response(MessageDef *msg_p, instance
...
@@ -1877,8 +1862,7 @@ static void rrc_CU_process_ue_context_setup_response(MessageDef *msg_p, instance
e1_send_bearer_updates
(
rrc
,
UE
,
resp
->
drbs_to_be_setup_length
,
resp
->
drbs_to_be_setup
);
e1_send_bearer_updates
(
rrc
,
UE
,
resp
->
drbs_to_be_setup_length
,
resp
->
drbs_to_be_setup
);
}
}
protocol_ctxt_t
ctxt
=
{.
rntiMaybeUEid
=
resp
->
gNB_CU_ue_id
,
.
module_id
=
instance
};
rrc_gNB_generate_dedicatedRRCReconfiguration
(
rrc
,
UE
);
rrc_gNB_generate_dedicatedRRCReconfiguration
(
&
ctxt
,
ue_context_p
);
}
}
static
void
rrc_CU_process_ue_context_release_request
(
MessageDef
*
msg_p
)
static
void
rrc_CU_process_ue_context_release_request
(
MessageDef
*
msg_p
)
...
@@ -1947,8 +1931,7 @@ static void rrc_CU_process_ue_context_release_complete(MessageDef *msg_p)
...
@@ -1947,8 +1931,7 @@ static void rrc_CU_process_ue_context_release_complete(MessageDef *msg_p)
static
void
rrc_CU_process_ue_context_modification_response
(
MessageDef
*
msg_p
,
instance_t
instance
)
static
void
rrc_CU_process_ue_context_modification_response
(
MessageDef
*
msg_p
,
instance_t
instance
)
{
{
f1ap_ue_context_modif_resp_t
*
resp
=
&
F1AP_UE_CONTEXT_MODIFICATION_RESP
(
msg_p
);
f1ap_ue_context_modif_resp_t
*
resp
=
&
F1AP_UE_CONTEXT_MODIFICATION_RESP
(
msg_p
);
protocol_ctxt_t
ctxt
=
{.
rntiMaybeUEid
=
resp
->
gNB_CU_ue_id
,
.
module_id
=
instance
,
.
instance
=
instance
,
.
enb_flag
=
1
,
.
eNB_index
=
instance
};
gNB_RRC_INST
*
rrc
=
RC
.
nrrrc
[
instance
];
gNB_RRC_INST
*
rrc
=
RC
.
nrrrc
[
ctxt
.
module_id
];
rrc_gNB_ue_context_t
*
ue_context_p
=
rrc_gNB_get_ue_context
(
rrc
,
resp
->
gNB_CU_ue_id
);
rrc_gNB_ue_context_t
*
ue_context_p
=
rrc_gNB_get_ue_context
(
rrc
,
resp
->
gNB_CU_ue_id
);
if
(
!
ue_context_p
)
{
if
(
!
ue_context_p
)
{
LOG_E
(
RRC
,
"could not find UE context for CU UE ID %u, aborting transaction
\n
"
,
resp
->
gNB_CU_ue_id
);
LOG_E
(
RRC
,
"could not find UE context for CU UE ID %u, aborting transaction
\n
"
,
resp
->
gNB_CU_ue_id
);
...
@@ -1976,7 +1959,7 @@ static void rrc_CU_process_ue_context_modification_response(MessageDef *msg_p, i
...
@@ -1976,7 +1959,7 @@ static void rrc_CU_process_ue_context_modification_response(MessageDef *msg_p, i
}
}
UE
->
masterCellGroup
=
cellGroupConfig
;
UE
->
masterCellGroup
=
cellGroupConfig
;
rrc_gNB_generate_dedicatedRRCReconfiguration
(
&
ctxt
,
ue_context_p
);
rrc_gNB_generate_dedicatedRRCReconfiguration
(
rrc
,
UE
);
}
}
}
}
...
...
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