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
ec463259
Commit
ec463259
authored
2 years ago
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/f1-interop-fixes' into integration_2022_wk46
parents
5c11306d
7853673d
Branches unavailable
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.w51
2022.w50
2022.w49
2022.w48
2022.w47
2022.w46
v2.1.0
v2.0.0
flexran-eol
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
61 additions
and
27 deletions
+61
-27
openair2/F1AP/f1ap_du_interface_management.c
openair2/F1AP/f1ap_du_interface_management.c
+26
-6
openair2/F1AP/f1ap_du_task.c
openair2/F1AP/f1ap_du_task.c
+0
-18
openair2/F1AP/f1ap_du_ue_context_management.c
openair2/F1AP/f1ap_du_ue_context_management.c
+31
-0
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+3
-2
openair3/ocp-gtpu/gtp_itf.cpp
openair3/ocp-gtpu/gtp_itf.cpp
+1
-1
No files found.
openair2/F1AP/f1ap_du_interface_management.c
View file @
ec463259
...
...
@@ -37,6 +37,8 @@
#include "f1ap_du_interface_management.h"
#include "assertions.h"
#include "GNB_APP/gnb_paramdef.h"
int
to_NRNRB
(
int
nrb
)
{
for
(
int
i
=
0
;
i
<
sizeofArray
(
nrb_lut
);
i
++
)
if
(
nrb_lut
[
i
]
==
nrb
)
...
...
@@ -180,11 +182,29 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance) {
served_plmns_itemExtIEs
->
extensionValue
.
present
=
F1AP_ServedPLMNs_ItemExtIEs__extensionValue_PR_SliceSupportList
;
F1AP_SliceSupportList_t
*
slice_support_list
=
&
served_plmns_itemExtIEs
->
extensionValue
.
choice
.
SliceSupportList
;
asn1cSequenceAdd
(
slice_support_list
->
list
,
F1AP_SliceSupportItem_t
,
SliceSupport_item
);
INT8_TO_OCTET_STRING
(
1
,
&
SliceSupport_item
->
sNSSAI
.
sST
);
asn1cCalloc
(
SliceSupport_item
->
sNSSAI
.
sD
,
tmp
);
INT24_TO_OCTET_STRING
(
10203
,
tmp
);
//INT24_TO_OCTET_STRING(1,tmp);
/* get list of sst/sd from configuration file */
paramdef_t
SNSSAIParams
[]
=
GNBSNSSAIPARAMS_DESC
;
paramlist_def_t
SNSSAIParamList
=
{
GNB_CONFIG_STRING_SNSSAI_LIST
,
NULL
,
0
};
char
sstr
[
100
];
/* TODO: be sure that %d in the line below is at the right place */
sprintf
(
sstr
,
"%s.[%d].%s.[0]"
,
GNB_CONFIG_STRING_GNB_LIST
,
i
,
GNB_CONFIG_STRING_PLMN_LIST
);
config_getlist
(
&
SNSSAIParamList
,
SNSSAIParams
,
sizeof
(
SNSSAIParams
)
/
sizeof
(
paramdef_t
),
sstr
);
AssertFatal
(
SNSSAIParamList
.
numelt
>
0
,
"no slice configuration found (snssaiList in the configuration file)
\n
"
);
AssertFatal
(
SNSSAIParamList
.
numelt
<=
1024
,
"maximum size for slice support list is 1024, see F1AP 38.473 9.3.1.37
\n
"
);
for
(
int
s
=
0
;
s
<
SNSSAIParamList
.
numelt
;
s
++
)
{
uint32_t
sst
;
uint32_t
sd
;
bool
has_sd
;
sst
=
*
SNSSAIParamList
.
paramarray
[
s
][
GNB_SLICE_SERVICE_TYPE_IDX
].
uptr
;
has_sd
=
*
SNSSAIParamList
.
paramarray
[
s
][
GNB_SLICE_DIFFERENTIATOR_IDX
].
uptr
!=
0xffffff
;
asn1cSequenceAdd
(
slice_support_list
->
list
,
F1AP_SliceSupportItem_t
,
slice
);
INT8_TO_OCTET_STRING
(
sst
,
&
slice
->
sNSSAI
.
sST
);
if
(
has_sd
)
{
sd
=
*
SNSSAIParamList
.
paramarray
[
s
][
GNB_SLICE_DIFFERENTIATOR_IDX
].
uptr
;
asn1cCalloc
(
slice
->
sNSSAI
.
sD
,
tmp
);
INT24_TO_OCTET_STRING
(
sd
,
tmp
);
}
}
if
(
f1ap_req
(
false
,
instance
)
->
fdd_flag
)
{
// FDD
nR_Mode_Info
->
present
=
F1AP_NR_Mode_Info_PR_fDD
;
...
...
This diff is collapsed.
Click to expand it.
openair2/F1AP/f1ap_du_task.c
View file @
ec463259
...
...
@@ -96,15 +96,6 @@ void du_task_handle_sctp_data_ind(instance_t instance, sctp_data_ind_t *sctp_dat
AssertFatal
(
result
==
EXIT_SUCCESS
,
"Failed to free memory (%d)!
\n
"
,
result
);
}
static
instance_t
du_create_gtpu_instance_to_cu
(
char
*
CUaddr
,
uint16_t
CUport
,
char
*
DUaddr
,
uint16_t
DUport
)
{
openAddr_t
tmp
=
{
0
};
strncpy
(
tmp
.
originHost
,
DUaddr
,
sizeof
(
tmp
.
originHost
)
-
1
);
strncpy
(
tmp
.
destinationHost
,
CUaddr
,
sizeof
(
tmp
.
destinationHost
)
-
1
);
sprintf
(
tmp
.
originService
,
"%d"
,
DUport
);
sprintf
(
tmp
.
destinationService
,
"%d"
,
CUport
);
return
gtpv1Init
(
tmp
);
}
void
*
F1AP_DU_task
(
void
*
arg
)
{
//sctp_cu_init();
LOG_I
(
F1AP
,
"Starting F1AP at DU
\n
"
);
...
...
@@ -126,15 +117,6 @@ void *F1AP_DU_task(void *arg) {
LOG_I
(
F1AP
,
"DU Task Received F1AP_SETUP_REQ
\n
"
);
f1ap_setup_req_t
*
msgSetup
=&
F1AP_SETUP_REQ
(
msg
);
createF1inst
(
false
,
myInstance
,
msgSetup
);
getCxt
(
DUtype
,
myInstance
)
->
gtpInst
=
du_create_gtpu_instance_to_cu
(
msgSetup
->
CU_f1_ip_address
.
ipv4_address
,
//"172.21.6.9", //"172.21.10.9",//"172.21.9.5", //msgSetup->CU_f1_ip_address.ipv4_address, //"192.168.18.91"
msgSetup
->
CUport
,
msgSetup
->
DU_f1_ip_address
.
ipv4_address
,
msgSetup
->
DUport
);
AssertFatal
(
getCxt
(
DUtype
,
myInstance
)
->
gtpInst
>
0
,
"Failed to create CU F1-U UDP listener"
);
// Fixme: fully inconsistent instances management
// dirty global var is a bad fix
extern
instance_t
legacyInstanceMapping
;
legacyInstanceMapping
=
DUuniqInstance
=
getCxt
(
DUtype
,
myInstance
)
->
gtpInst
;
du_task_send_sctp_association_req
(
myInstance
,
msgSetup
);
break
;
...
...
This diff is collapsed.
Click to expand it.
openair2/F1AP/f1ap_du_ue_context_management.c
View file @
ec463259
...
...
@@ -1078,6 +1078,17 @@ int DU_send_UE_CONTEXT_RELEASE_COMPLETE(instance_t instance,
f1ap_remove_ue
(
DUtype
,
instance
,
cplt
->
rnti
);
return
0
;
}
static
instance_t
du_create_gtpu_instance_to_cu
(
char
*
CUaddr
,
uint16_t
CUport
,
char
*
DUaddr
,
uint16_t
DUport
)
{
openAddr_t
tmp
;
strncpy
(
tmp
.
originHost
,
DUaddr
,
sizeof
(
tmp
.
originHost
)
-
1
);
strncpy
(
tmp
.
destinationHost
,
CUaddr
,
sizeof
(
tmp
.
destinationHost
)
-
1
);
sprintf
(
tmp
.
originService
,
"%d"
,
DUport
);
sprintf
(
tmp
.
destinationService
,
"%d"
,
CUport
);
return
gtpv1Init
(
tmp
);
}
int
DU_handle_UE_CONTEXT_MODIFICATION_REQUEST
(
instance_t
instance
,
uint32_t
assoc_id
,
uint32_t
stream
,
...
...
@@ -1160,6 +1171,26 @@ int DU_handle_UE_CONTEXT_MODIFICATION_REQUEST(instance_t instance,
// 3GPP assumes GTP-U is on port 2152, but OAI is configurable
drb_p
->
up_ul_tnl
[
0
].
port
=
getCxt
(
false
,
instance
)
->
setupReq
.
CUport
;
extern
instance_t
DUuniqInstance
;
if
(
DUuniqInstance
==
0
)
{
char
gtp_tunnel_ip_address
[
128
];
sprintf
(
gtp_tunnel_ip_address
,
"%d.%d.%d.%d"
,
drb_p
->
up_ul_tnl
[
0
].
tl_address
&
0xff
,
(
drb_p
->
up_ul_tnl
[
0
].
tl_address
>>
8
)
&
0xff
,
(
drb_p
->
up_ul_tnl
[
0
].
tl_address
>>
16
)
&
0xff
,
(
drb_p
->
up_ul_tnl
[
0
].
tl_address
>>
24
)
&
0xff
);
getCxt
(
DUtype
,
instance
)
->
gtpInst
=
du_create_gtpu_instance_to_cu
(
gtp_tunnel_ip_address
,
getCxt
(
false
,
instance
)
->
setupReq
.
CUport
,
getCxt
(
false
,
instance
)
->
setupReq
.
DU_f1_ip_address
.
ipv4_address
,
getCxt
(
false
,
instance
)
->
setupReq
.
DUport
);
AssertFatal
(
getCxt
(
DUtype
,
instance
)
->
gtpInst
>
0
,
"Failed to create CU F1-U UDP listener"
);
// Fixme: fully inconsistent instances management
// dirty global var is a bad fix
extern
instance_t
legacyInstanceMapping
;
legacyInstanceMapping
=
DUuniqInstance
=
getCxt
(
DUtype
,
instance
)
->
gtpInst
;
}
switch
(
drbs_tobesetupmod_item_p
->
rLCMode
)
{
case
F1AP_RLCMode_rlc_am
:
drb_p
->
rlc_mode
=
RLC_MODE_AM
;
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/rrc_gNB.c
View file @
ec463259
...
...
@@ -3407,6 +3407,7 @@ static void rrc_DU_process_ue_context_modification_request(MessageDef *msg_p, co
/* Configure DRB */
NR_DRB_ToAddMod_t
*
DRB_config
=
NULL
;
NR_DRB_ToAddModList_t
*
DRB_configList
=
NULL
;
int
drb_id_to_setup_start
=
0
;
if
(
req
->
drbs_to_be_setup_length
>
0
){
if
(
ue_context_p
->
ue_context
.
DRB_configList
==
NULL
){
ue_context_p
->
ue_context
.
DRB_configList
=
CALLOC
(
1
,
sizeof
(
*
ue_context_p
->
ue_context
.
DRB_configList
));
...
...
@@ -3421,6 +3422,7 @@ static void rrc_DU_process_ue_context_modification_request(MessageDef *msg_p, co
memcpy
(
addr
.
buffer
,
&
drb_p
.
up_ul_tnl
[
0
].
tl_address
,
sizeof
(
drb_p
.
up_ul_tnl
[
0
].
tl_address
));
addr
.
length
=
sizeof
(
drb_p
.
up_ul_tnl
[
0
].
tl_address
)
*
8
;
extern
instance_t
DUuniqInstance
;
if
(
!
drb_id_to_setup_start
)
drb_id_to_setup_start
=
drb_p
.
drb_id
;
incoming_teid
=
newGtpuCreateTunnel
(
DUuniqInstance
,
req
->
rnti
,
drb_p
.
drb_id
,
...
...
@@ -3436,7 +3438,6 @@ static void rrc_DU_process_ue_context_modification_request(MessageDef *msg_p, co
if
(
req
->
srbs_to_be_setup_length
>
0
||
req
->
drbs_to_be_setup_length
>
0
){
cellGroupConfig
=
calloc
(
1
,
sizeof
(
NR_CellGroupConfig_t
));
uint8_t
drb_id_to_setup_start
=
1
;
long
drb_priority
[
1
]
=
{
13
};
// For now, we assume only one drb per pdu sessions with a default preiority (will be dynamique in future)
fill_mastercellGroupConfig
(
cellGroupConfig
,
ue_context_p
->
ue_context
.
masterCellGroup
,
...
...
@@ -3456,7 +3457,7 @@ static void rrc_DU_process_ue_context_modification_request(MessageDef *msg_p, co
LOG_I
(
NR_RRC
,
"Send first DDD buffer status reporting towards the CU through an ITTI message to gtp-u
\n
"
);
uint8_t
drb_id
=
ue_context_p
->
ue_context
.
DRB_configList
->
list
.
array
[
0
]
->
drb_Identity
;
rnti_t
rnti
=
ue_context_p
->
ue_context
.
rnti
;
int
rlc_tx_buffer_space
=
nr_rlc_get_available_tx_space
(
rnti
,
drb_id
);
int
rlc_tx_buffer_space
=
nr_rlc_get_available_tx_space
(
rnti
,
drb_id
+
3
);
LOG_I
(
NR_RRC
,
"Reported in DDD drb_id:%d, rnti:%d
\n
"
,
drb_id
,
rnti
);
MessageDef
*
msg
=
itti_alloc_new_message_sized
(
TASK_RRC_GNB
,
0
,
GTPV1U_DU_BUFFER_REPORT_REQ
,
sizeof
(
gtpv1u_gnb_tunnel_data_req_t
));
...
...
This diff is collapsed.
Click to expand it.
openair3/ocp-gtpu/gtp_itf.cpp
View file @
ec463259
...
...
@@ -1115,7 +1115,7 @@ static int Gtpv1uHandleGpdu(int h,
if
(
NR_PDCP_PDU_SN
>
0
&&
NR_PDCP_PDU_SN
%
5
==
0
){
LOG_D
(
GTPU
,
"Create and send DL DATA Delivery status for the previously received PDU, NR_PDCP_PDU_SN: %u
\n
"
,
NR_PDCP_PDU_SN
);
int
rlc_tx_buffer_space
=
nr_rlc_get_available_tx_space
(
ctxt
.
rnti
,
rb_id
);
int
rlc_tx_buffer_space
=
nr_rlc_get_available_tx_space
(
ctxt
.
rnti
,
rb_id
+
3
);
LOG_D
(
GTPU
,
"Available buffer size in RLC for Tx: %d
\n
"
,
rlc_tx_buffer_space
);
/*Total size of DDD_status PDU = 1 octet to report extension header length
* size of mandatory part + 3 octets for highest transmitted/delivered PDCP SN
...
...
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