Skip to content

O
OpenXG-RAN
Commit 3d3d4036 authored by Victor Souza's avatar Victor Souza
Browse files
Options

some corrections

parent 9ee12ae5
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 27 deletions
openair2/COMMON/f1ap_messages_types.h
View file @ 3d3d4036
......@@ -358,11 +358,11 @@ typedef struct f1ap_srb_to_be_setup_s {
/* [IAB] related structures -- */
typedef struct f1ap_iPHeaderInformation_s{
union destinationIABTNLAddress{
uint32_t ipv4Address;
union DestinationIABTNLAddress{
in_addr_t ipv4Address;
// ipv6Address;
// ipv6Prefix;
};
} destinationIABTNLAddress;
enum {
ipv4Address,
ipv6Address,
......@@ -419,17 +419,18 @@ typedef struct traffic_mapping_info_s{
}bAPlayerBHRLCchannelMappingInfo;
};
enum {
iPtolayer2TrafficMappingInfo,
bAPlayerBHRLCchannelMappingInfo
mapping_info_iPtolayer2TrafficMappingInfo,
mapping_info_bAPlayerBHRLCchannelMappingInfo
} type;
}traffic_mapping_info_t;
typedef struct f1ap_bhchannel_to_be_setup_s {
long bhch_id;
uint16_t bHRLCChannelID;
/* TODO: f1ap_qos_flow_level_qos_parameters_t bhch_qos; */
rlc_mode_t rlc_mode;
long is_bap_Ctrl_PDU_Channel;
int is_bap_Ctrl_PDU_Channel; // should be ENUMERATED {true, ...}
traffic_mapping_info_t trafficMappingInfo;
bool is_trafficMappingInfo_set;
} f1ap_bhchannel_to_be_setup_t;
/* -- [IAB] end of related structures */
......
openair2/F1AP/MESSAGES/ASN1/R16.3.1/38473-g31.asn
View file @ 3d3d4036
......@@ -6854,8 +6854,7 @@ IPtolayer2TrafficMappingInfoList ::= SEQUENCE (SIZE(1..maxnoofMappingEntries)) O
IPtolayer2TrafficMappingInfo-Item ::= SEQUENCE {
mappingInformationIndex MappingInformationIndex,
iPHeaderInformation IPHeaderInformation,
bHInfo BHInfo,
iE-Extensions ProtocolExtensionContainer { { IPtolayer2TrafficMappingInfo-ItemExtIEs} } OPTIONAL,
bHInfo BHInfo, iE-Extensions ProtocolExtensionContainer { { IPtolayer2TrafficMappingInfo-ItemExtIEs} } OPTIONAL,
...
}
......
openair2/F1AP/f1ap_cu_ue_context_management.c
View file @ 3d3d4036
......@@ -1596,8 +1596,9 @@ int CU_send_UE_CONTEXT_MODIFICATION_REQUEST(sctp_assoc_t assoc_id, f1ap_ue_conte
F1AP_BHChannels_ToBeSetupMod_Item_t *bhchs_toBeSetupMod_item=
&bhchs_toBeSetupMod_item_ies->value.choice.BHChannels_ToBeSetupMod_Item;
/* 31.1.1 bHRLCChannelID */
bhchs_toBeSetupMod_item->bHRLCChannelID = f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].bhch_id;
/* 31.1.1 bHRLCChannelID */
NR_BHRLCCHANNELID_TO_BIT_STRING(f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].bHRLCChannelID,
&bhchs_toBeSetupMod_item->bHRLCChannelID);
/* 31.1.2 bHQoSInformation CHOICE*/
if(f1ap_ue_context_modification_req->QoS_information_type == bHRLCCH_QoS){
......@@ -1613,29 +1614,28 @@ int CU_send_UE_CONTEXT_MODIFICATION_REQUEST(sctp_assoc_t assoc_id, f1ap_ue_conte
}else{
/* cPTrafficType */
bhchs_toBeSetupMod_item->bHQoSInformation.present = F1AP_BHQoSInformation_PR_cPTrafficType;
*bhchs_toBeSetupMod_item->bHQoSInformation.choice.cPTrafficType = 1; // integer (hardcoded for now)
bhchs_toBeSetupMod_item->bHQoSInformation.choice.cPTrafficType = 1; // integer (hardcoded for now)
}
/* 31.1.3 rLCmode */
if(f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].rlc_mode != NULL){
bhchs_toBeSetupMod_item->rLCmode = calloc(1, sizeof(F1AP_RLCMode_t));
bhchs_toBeSetupMod_item->rLCmode = f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].rlc_mode;
}
bhchs_toBeSetupMod_item->rLCmode = f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].rlc_mode;
/* 31.1.4 bAPCtrlPDUChannel */
if(f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].is_bap_Ctrl_PDU_Channel != NULL){
bhchs_toBeSetupMod_item->bAPCtrlPDUChannel = calloc(1, sizeof(long));
bhchs_toBeSetupMod_item->bAPCtrlPDUChannel = f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].is_bap_Ctrl_PDU_Channel;
if(f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].is_bap_Ctrl_PDU_Channel == 1){ // 1 being true
bhchs_toBeSetupMod_item->bAPCtrlPDUChannel = calloc(1, sizeof(F1AP_BAPCtrlPDUChannel_t));
bhchs_toBeSetupMod_item->bAPCtrlPDUChannel = F1AP_BAPCtrlPDUChannel_true;
}
/* 31.1.5 trafficMappingInfo */
if(f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].trafficMappingInfo != NULL){
if(f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].is_trafficMappingInfo_set){
bhchs_toBeSetupMod_item->trafficMappingInfo = calloc(1, sizeof(F1AP_TrafficMappingInfo_t));
traffic_mapping_info_t *traffic_mapping_info = f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].trafficMappingInfo;
traffic_mapping_info_t traffic_mapping_info = f1ap_ue_context_modification_req->bhchannels_to_be_setup[i].trafficMappingInfo;
// iPtolayer2TrafficMappingInfo
if (traffic_mapping_info.type == iPtolayer2TrafficMappingInfo){
bhchs_toBeSetupMod_item->trafficMappingInfo.present = F1AP_TrafficMappingInfo_PR_IPtolayer2TrafficMappingInfo;
asn1cCalloc(bhchs_toBeSetupMod_item->trafficMappingInfo.choice.iPtolayer2TrafficMappingInfo, iPToL2Info);
if (traffic_mapping_info.type == mapping_info_iPtolayer2TrafficMappingInfo){
bhchs_toBeSetupMod_item->trafficMappingInfo->present = F1AP_TrafficMappingInfo_PR_iPtolayer2TrafficMappingInfo;
asn1cCalloc(bhchs_toBeSetupMod_item->trafficMappingInfo->choice.iPtolayer2TrafficMappingInfo, iPToL2Info);
if(traffic_mapping_info->iPtolayer2TrafficMappingInfo->iPtolayer2TrafficMappingInfoToAdd != NULL &&
traffic_mapping_info->iPtolayer2TrafficMappingInfo.add_length > 0){
......@@ -1654,8 +1654,8 @@ int CU_send_UE_CONTEXT_MODIFICATION_REQUEST(sctp_assoc_t assoc_id, f1ap_ue_conte
/* Only IPv4 implemented for now,
missing IPv6 address and IPv6 prefix */
if(this_ip2l2_item->iPHeaderInformation.destinationIABTNLAddress_type == ipv4Address){
iPToL2Item->iPHeaderInformation->destinationIABTNLAddress.present = F1AP_IABTNLAddress_pr_iPv4Address;
iPToL2Item->iPHeaderInformation->destinationIABTNLAddress.choice.ipv4Address = this_ip2l2_item->iPHeaderInformation->destinationIABTNLAddress.ipv4Address;
iPToL2Item->iPHeaderInformation->destinationIABTNLAddress.present = F1AP_IABTNLAddress_PR_iPv4Address;
iPToL2Item->iPHeaderInformation->destinationIABTNLAddress.choice.ipv4Address = this_ip2l2_item->iPHeaderInformation.destinationIABTNLAddress.ipv4Address;
}
if(this_ip2l2_item->iPHeaderInformation->dsInformationList != NULL &&
......@@ -1703,7 +1703,7 @@ int CU_send_UE_CONTEXT_MODIFICATION_REQUEST(sctp_assoc_t assoc_id, f1ap_ue_conte
}
// bAPlayerBHRLCchannelMappingInfo
else if (traffic_mapping_info.type == bAPlayerBHRLCchannelMappingInfo){
else if (traffic_mapping_info.type == mapping_info_bAPlayerBHRLCchannelMappingInfo){
bhchs_toBeSetupMod_item->trafficMappingInfo.present = F1AP_TrafficMappingInfo_PR_BAPlayerBHRLCchannelMappingInfo;
asn1cCalloc(bhchs_toBeSetupMod_item->trafficMappingInfo.choice.bAPlayerBHRLCchannelMappingInfo, bapBHInfo);
......
openair3/UTILS/conversions.h
View file @ 3d3d4036
......@@ -455,6 +455,18 @@ do { \
(bITsTRING)->bits_unused = 4; \
} while(0)
/* TS 38.331 BH-RLC-ChannelID
* uint16_t to BIT STRING (SIZE(16))
*/
#define NR_BHRLCCHANNELID_TO_BIT_STRING(mACRO, bITsTRING) \
do { \
(bITsTRING)->buf = calloc(2, sizeof(uint8_t)); \
(bITsTRING)->buf[0] = ((mACRO) >> 8) & 0xff; \
(bITsTRING)->buf[1] = (mACRO) & 0xff; \
(bITsTRING)->size = 2; \
(bITsTRING)->bits_unused = 0; \
} while(0)
/*
#define INT16_TO_3_BYTE_BUFFER(x, buf) \
do { \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment