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
40b131be
Commit
40b131be
authored
Oct 13, 2021
by
matzakos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small corrections in F1AP UE context management messages and indentation fixes
parent
b37195ad
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
198 additions
and
204 deletions
+198
-204
openair2/F1AP/f1ap_cu_ue_context_management.c
openair2/F1AP/f1ap_cu_ue_context_management.c
+30
-30
openair2/F1AP/f1ap_du_ue_context_management.c
openair2/F1AP/f1ap_du_ue_context_management.c
+167
-174
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+1
-0
No files found.
openair2/F1AP/f1ap_cu_ue_context_management.c
View file @
40b131be
...
...
@@ -1090,52 +1090,52 @@ int CU_send_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, f1ap_ue_context
}
/* optional */
/* c
5
. CUtoDURRCInformation */
/* c
6
. CUtoDURRCInformation */
if
(
f1ap_ue_context_modification_req
->
cu_to_du_rrc_information
!=
NULL
)
{
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_UEContextModificationRequestIEs_t
,
ie
5
);
ie
5
->
id
=
F1AP_ProtocolIE_ID_id_CUtoDURRCInformation
;
ie
5
->
criticality
=
F1AP_Criticality_reject
;
ie
5
->
value
.
present
=
F1AP_UEContextModificationRequestIEs__value_PR_CUtoDURRCInformation
;
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_UEContextModificationRequestIEs_t
,
ie
6
);
ie
6
->
id
=
F1AP_ProtocolIE_ID_id_CUtoDURRCInformation
;
ie
6
->
criticality
=
F1AP_Criticality_reject
;
ie
6
->
value
.
present
=
F1AP_UEContextModificationRequestIEs__value_PR_CUtoDURRCInformation
;
/* 6.1 cG_ConfigInfo */
if
(
f1ap_ue_context_modification_req
->
cu_to_du_rrc_information
->
cG_ConfigInfo
!=
NULL
){
const
char
cG_ConfigInfoStr
[]
=
"asdsa1d32sa1d31asd31as"
;
asn1cCalloc
(
ie5
->
value
.
choice
.
CUtoDURRCInformation
.
cG_ConfigInfo
,
cG_ConfigInfo
);
OCTET_STRING_fromBuf
(
cG_ConfigInfo
,
cG_ConfigInfoStr
,
strlen
(
cG_ConfigInfoStr
))
;
asn1cCalloc
(
ie6
->
value
.
choice
.
CUtoDURRCInformation
.
cG_ConfigInfo
,
cG_ConfigInfo
)
;
OCTET_STRING_fromBuf
(
cG_ConfigInfo
,
(
const
char
*
)
f1ap_ue_context_modification_req
->
cu_to_du_rrc_information
->
cG_ConfigInfo
,
f1ap_ue_context_modification_req
->
cu_to_du_rrc_information
->
cG_ConfigInfo_length
)
;
}
/* optional */
/* 6.2 uE_CapabilityRAT_ContainerList */
if
(
f1ap_ue_context_modification_req
->
cu_to_du_rrc_information
->
uE_CapabilityRAT_ContainerList
!=
NULL
){
asn1cCalloc
(
ie
5
->
value
.
choice
.
CUtoDURRCInformation
.
uE_CapabilityRAT_ContainerList
,
uE_CapabilityRAT_ContainerList
);
asn1cCalloc
(
ie
6
->
value
.
choice
.
CUtoDURRCInformation
.
uE_CapabilityRAT_ContainerList
,
uE_CapabilityRAT_ContainerList
);
OCTET_STRING_fromBuf
(
uE_CapabilityRAT_ContainerList
,
(
const
char
*
)
f1ap_ue_context_modification_req
->
cu_to_du_rrc_information
->
uE_CapabilityRAT_ContainerList
,
f1ap_ue_context_modification_req
->
cu_to_du_rrc_information
->
uE_CapabilityRAT_ContainerList_length
)
;
}
/* optional */
/* 6.3 measConfig */
if
(
f1ap_ue_context_modification_req
->
cu_to_du_rrc_information
->
measConfig
!=
NULL
){
const
char
measConfigStr
[]
=
"asdsa1d32sa1d31asd31as"
;
asn1cCalloc
(
ie5
->
value
.
choice
.
CUtoDURRCInformation
.
measConfig
,
measConfig
);
OCTET_STRING_fromBuf
(
measConfig
,
measConfigStr
,
strlen
(
measConfigStr
))
;
asn1cCalloc
(
ie6
->
value
.
choice
.
CUtoDURRCInformation
.
measConfig
,
measConfig
)
;
OCTET_STRING_fromBuf
(
measConfig
,
(
const
char
*
)
f1ap_ue_context_modification_req
->
cu_to_du_rrc_information
->
measConfig
,
f1ap_ue_context_modification_req
->
cu_to_du_rrc_information
->
measConfig_length
)
;
}
}
/* optional */
/* c
6
. TransmissionActionIndicator */
/* c
7
. TransmissionActionIndicator */
if
(
0
)
{
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_UEContextModificationRequestIEs_t
,
ie
6
);
ie
6
->
id
=
F1AP_ProtocolIE_ID_id_TransmissionActionIndicator
;
ie
6
->
criticality
=
F1AP_Criticality_ignore
;
ie
6
->
value
.
present
=
F1AP_UEContextModificationRequestIEs__value_PR_TransmissionActionIndicator
;
ie
6
->
value
.
choice
.
TransmissionActionIndicator
=
F1AP_TransmissionActionIndicator_stop
;
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_UEContextModificationRequestIEs_t
,
ie
7
);
ie
7
->
id
=
F1AP_ProtocolIE_ID_id_TransmissionActionIndicator
;
ie
7
->
criticality
=
F1AP_Criticality_ignore
;
ie
7
->
value
.
present
=
F1AP_UEContextModificationRequestIEs__value_PR_TransmissionActionIndicator
;
ie
7
->
value
.
choice
.
TransmissionActionIndicator
=
F1AP_TransmissionActionIndicator_stop
;
}
/* optional */
/* c
7
. ResourceCoordinationTransferContainer */
/* c
8
. ResourceCoordinationTransferContainer */
if
(
0
)
{
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_UEContextModificationRequestIEs_t
,
ie
7
);
ie
7
->
id
=
F1AP_ProtocolIE_ID_id_ResourceCoordinationTransferContainer
;
ie
7
->
criticality
=
F1AP_Criticality_ignore
;
ie
7
->
value
.
present
=
F1AP_UEContextModificationRequestIEs__value_PR_ResourceCoordinationTransferContainer
;
OCTET_STRING_fromBuf
(
&
ie
7
->
value
.
choice
.
ResourceCoordinationTransferContainer
,
"asdsa1d32sa1d31asd31as"
,
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_UEContextModificationRequestIEs_t
,
ie
8
);
ie
8
->
id
=
F1AP_ProtocolIE_ID_id_ResourceCoordinationTransferContainer
;
ie
8
->
criticality
=
F1AP_Criticality_ignore
;
ie
8
->
value
.
present
=
F1AP_UEContextModificationRequestIEs__value_PR_ResourceCoordinationTransferContainer
;
OCTET_STRING_fromBuf
(
&
ie
8
->
value
.
choice
.
ResourceCoordinationTransferContainer
,
"asdsa1d32sa1d31asd31as"
,
strlen
(
"asdsa1d32sa1d31asd31as"
));
}
...
...
@@ -1152,11 +1152,11 @@ int CU_send_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance, f1ap_ue_context
/* optional */
/* c8. RRCContainer */
if
(
0
)
{
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_UEContextModificationRequestIEs_t
,
ie8
);
ie8
->
id
=
F1AP_ProtocolIE_ID_id_RRCContainer
;
ie8
->
criticality
=
F1AP_Criticality_ignore
;
ie8
->
value
.
present
=
F1AP_UEContextModificationRequestIEs__value_PR_RRCContainer
;
OCTET_STRING_fromBuf
(
&
ie8
->
value
.
choice
.
RRCContainer
,
"asdsa1d32sa1d31asd31as"
,
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_UEContextModificationRequestIEs_t
,
ie8
1
);
ie8
1
->
id
=
F1AP_ProtocolIE_ID_id_RRCContainer
;
ie8
1
->
criticality
=
F1AP_Criticality_ignore
;
ie8
1
->
value
.
present
=
F1AP_UEContextModificationRequestIEs__value_PR_RRCContainer
;
OCTET_STRING_fromBuf
(
&
ie8
1
->
value
.
choice
.
RRCContainer
,
"asdsa1d32sa1d31asd31as"
,
strlen
(
"asdsa1d32sa1d31asd31as"
));
}
...
...
@@ -1661,7 +1661,7 @@ int CU_handle_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance,
/* GNB_CU_UE_F1AP_ID */
F1AP_FIND_PROTOCOLIE_BY_ID
(
F1AP_UEContextModificationResponseIEs_t
,
ie
,
container
,
F1AP_ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID
,
fals
e
);
F1AP_ProtocolIE_ID_id_gNB_CU_UE_F1AP_ID
,
tru
e
);
f1ap_ue_context_modification_resp
->
gNB_CU_ue_id
=
ie
->
value
.
choice
.
GNB_CU_UE_F1AP_ID
;
LOG_D
(
F1AP
,
"f1ap_ue_context_setup_resp->gNB_CU_ue_id is: %d
\n
"
,
f1ap_ue_context_modification_resp
->
gNB_CU_ue_id
);
...
...
openair2/F1AP/f1ap_du_ue_context_management.c
View file @
40b131be
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/rrc_gNB.c
View file @
40b131be
...
...
@@ -3668,6 +3668,7 @@ static void rrc_CU_process_ue_context_modification_response(MessageDef *msg_p, c
sizeof
(
*
cellGroupConfig
->
rlc_BearerToAddModList
));
}
}
LOG_I
(
NR_RRC
,
"Updated master cell group configuration stored at the UE context of the CU:
\n
"
);
xer_fprint
(
stdout
,
&
asn_DEF_NR_CellGroupConfig
,
ue_context_p
->
ue_context
.
masterCellGroup
);
rrc_gNB_generate_dedicatedRRCReconfiguration
(
&
ctxt
,
ue_context_p
,
cellGroupConfig
);
...
...
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