Skip to content

O
OpenXG-RAN
Commit a5975312 authored by laurent's avatar laurent
Browse files
Options

tmp

parent d379bbae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2004 additions and 3341 deletions
CMakeLists.txt
View file @ a5975312
This diff is collapsed.
common/ngran_types.h
View file @ a5975312
...@@ -54,4 +54,7 @@ typedef enum { CPtype = 0, UPtype } E1_t; ...@@ -54,4 +54,7 @@ typedef enum { CPtype = 0, UPtype } E1_t;
#define NODE_IS_DU(nOdE_TyPe) ((nOdE_TyPe) == ngran_eNB_DU || (nOdE_TyPe) == ngran_gNB_DU) #define NODE_IS_DU(nOdE_TyPe) ((nOdE_TyPe) == ngran_eNB_DU || (nOdE_TyPe) == ngran_gNB_DU)
#define NODE_IS_MBMS(nOdE_TyPe) ((nOdE_TyPe) == ngran_eNB_MBMS_STA) #define NODE_IS_MBMS(nOdE_TyPe) ((nOdE_TyPe) == ngran_eNB_MBMS_STA)
#define GTPV1_U_PORT_NUMBER (2152) #define GTPV1_U_PORT_NUMBER (2152)
typedef enum { non_dynamic, dynamic } fiveQI_type_t;
#define maxSRBs 4
#endif #endif
openair2/COMMON/e1ap_messages_types.h
View file @ a5975312
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#ifndef E1AP_MESSAGES_TYPES_H #ifndef E1AP_MESSAGES_TYPES_H
#define E1AP_MESSAGES_TYPES_H #define E1AP_MESSAGES_TYPES_H
#include "common/ngran_types.h"
#include "f1ap_messages_types.h" #include "f1ap_messages_types.h"
#include "ngap_messages_types.h" #include "ngap_messages_types.h"
......
openair2/COMMON/ngap_messages_types.h
View file @ a5975312
...@@ -29,8 +29,9 @@ ...@@ -29,8 +29,9 @@
#ifndef NGAP_MESSAGES_TYPES_H_ #ifndef NGAP_MESSAGES_TYPES_H_
#define NGAP_MESSAGES_TYPES_H_ #define NGAP_MESSAGES_TYPES_H_
#include "common/ngran_types.h"
#include "LTE_asn_constant.h" #include "LTE_asn_constant.h"
#include "NGAP_Cause.h"
//-------------------------------------------------------------------------------------------// //-------------------------------------------------------------------------------------------//
// Defines to access message fields. // Defines to access message fields.
...@@ -49,7 +50,7 @@ ...@@ -49,7 +50,7 @@
#define NGAP_UE_CTXT_MODIFICATION_RESP(mSGpTR) (mSGpTR)->ittiMsg.ngap_ue_ctxt_modification_resp #define NGAP_UE_CTXT_MODIFICATION_RESP(mSGpTR) (mSGpTR)->ittiMsg.ngap_ue_ctxt_modification_resp
#define NGAP_UE_CTXT_MODIFICATION_FAIL(mSGpTR) (mSGpTR)->ittiMsg.ngap_ue_ctxt_modification_fail #define NGAP_UE_CTXT_MODIFICATION_FAIL(mSGpTR) (mSGpTR)->ittiMsg.ngap_ue_ctxt_modification_fail
#define NGAP_PDUSESSION_SETUP_RESP(mSGpTR) (mSGpTR)->ittiMsg.ngap_pdusession_setup_resp #define NGAP_PDUSESSION_SETUP_RESP(mSGpTR) (mSGpTR)->ittiMsg.ngap_pdusession_setup_resp
#define NGAP_PDUSESSION_SETUP_FAIL(mSGpTR) (mSGpTR)->ittiMsg.ngap_pdusession_setup_req_fail #define NGAP_PDUSESSION_SETUP_FAIL(mSGpTR) (mSGpTR)->ittiMsg.ngap_pdusession_setup_request_fail
#define NGAP_PDUSESSION_MODIFY_RESP(mSGpTR) (mSGpTR)->ittiMsg.ngap_pdusession_modify_resp #define NGAP_PDUSESSION_MODIFY_RESP(mSGpTR) (mSGpTR)->ittiMsg.ngap_pdusession_modify_resp
#define NGAP_PATH_SWITCH_REQ(mSGpTR) (mSGpTR)->ittiMsg.ngap_path_switch_req #define NGAP_PATH_SWITCH_REQ(mSGpTR) (mSGpTR)->ittiMsg.ngap_path_switch_req
#define NGAP_PATH_SWITCH_REQ_ACK(mSGpTR) (mSGpTR)->ittiMsg.ngap_path_switch_req_ack #define NGAP_PATH_SWITCH_REQ_ACK(mSGpTR) (mSGpTR)->ittiMsg.ngap_path_switch_req_ack
...@@ -194,6 +195,13 @@ typedef enum ngap_rrc_establishment_cause_e { ...@@ -194,6 +195,13 @@ typedef enum ngap_rrc_establishment_cause_e {
NGAP_RRC_CAUSE_LAST NGAP_RRC_CAUSE_LAST
} ngap_rrc_establishment_cause_t; } ngap_rrc_establishment_cause_t;
typedef struct pdusession_level_qos_parameter_s {
uint8_t qfi;
uint64_t fiveQI;
fiveQI_type_t fiveQI_type;
ngap_allocation_retention_priority_t allocation_retention_priority;
} pdusession_level_qos_parameter_t;
typedef struct ngap_guami_s { typedef struct ngap_guami_s {
uint16_t mcc; uint16_t mcc;
uint16_t mnc; uint16_t mnc;
...@@ -242,7 +250,7 @@ typedef struct ngap_nas_pdu_s { ...@@ -242,7 +250,7 @@ typedef struct ngap_nas_pdu_s {
uint8_t *buffer; uint8_t *buffer;
/* Length of the octet string */ /* Length of the octet string */
uint32_t length; uint32_t length;
} ngap_nas_pdu_t, ngap_ue_radio_cap_t; } ngap_pdu_t;
typedef struct ngap_mobility_restriction_s{ typedef struct ngap_mobility_restriction_s{
ngap_plmn_identity_t serving_plmn; ngap_plmn_identity_t serving_plmn;
...@@ -267,43 +275,22 @@ typedef struct ngap_transport_layer_addr_s { ...@@ -267,43 +275,22 @@ typedef struct ngap_transport_layer_addr_s {
uint8_t buffer[20]; // in network byte order uint8_t buffer[20]; // in network byte order
} ngap_transport_layer_addr_t; } ngap_transport_layer_addr_t;
#define TRANSPORT_LAYER_ADDR_COPY(dEST,sOURCE) \
do { \
AssertFatal(sOURCE.len <= 20); \
memcpy(dEST.buffer, sOURCE.buffer, sOURCE.len); \
dEST.length = sOURCE.length; \
} while (0)
typedef enum {
non_dynamic,
dynamic
} fiveQI_type_t;
typedef struct pdusession_level_qos_parameter_s {
uint8_t qfi;
uint64_t fiveQI;
fiveQI_type_t fiveQI_type;
ngap_allocation_retention_priority_t allocation_retention_priority;
} pdusession_level_qos_parameter_t;
typedef struct pdusession_s { typedef struct pdusession_s {
/* Unique pdusession_id for the UE. */ /* Unique pdusession_id for the UE. */
uint8_t pdusession_id; int pdusession_id;
ngap_pdu_t nas_pdu;
uint8_t nb_qos; ngap_pdu_t pdusessionTransfer;
uint8_t nb_qos;
/* Quality of service for this pdusession */ /* Quality of service for this pdusession */
pdusession_level_qos_parameter_t qos[QOSFLOW_MAX_VALUE]; pdusession_level_qos_parameter_t qos[QOSFLOW_MAX_VALUE];
/* The NAS PDU should be forwarded by the RRC layer to the NAS layer */
ngap_nas_pdu_t nas_pdu;
/* The transport layer address for the IP packets */ /* The transport layer address for the IP packets */
ngap_transport_layer_addr_t upf_addr; ngap_transport_layer_addr_t upf_addr;
/* S-GW Tunnel endpoint identifier */ /* S-GW Tunnel endpoint identifier */
uint32_t gtp_teid; uint32_t gtp_teid;
/* Stores the DRB ID of the DRBs used by this PDU Session */ /* Stores the DRB ID of the DRBs used by this PDU Session */
uint8_t used_drbs[NGAP_MAX_DRBS_PER_UE]; uint8_t used_drbs[NGAP_MAX_DRBS_PER_UE];
} pdusession_t; } pdusession_t;
typedef enum pdusession_qosflow_mapping_ind_e{ typedef enum pdusession_qosflow_mapping_ind_e{
QOSFLOW_MAPPING_INDICATION_UL = 0, QOSFLOW_MAPPING_INDICATION_UL = 0,
QOSFLOW_MAPPING_INDICATION_DL = 1, QOSFLOW_MAPPING_INDICATION_DL = 1,
...@@ -332,20 +319,6 @@ typedef struct pdusession_setup_s { ...@@ -332,20 +319,6 @@ typedef struct pdusession_setup_s {
pdusession_associate_qosflow_t associated_qos_flows[QOSFLOW_MAX_VALUE]; pdusession_associate_qosflow_t associated_qos_flows[QOSFLOW_MAX_VALUE];
} pdusession_setup_t; } pdusession_setup_t;
typedef struct pdusession_tobe_added_s {
/* Unique pdusession_id for the UE. */
uint8_t pdusession_id;
/* Unique drb_ID for the UE. */
uint8_t drb_ID;
/* The transport layer address for the IP packets */
ngap_transport_layer_addr_t upf_addr;
/* S-GW Tunnel endpoint identifier */
uint32_t gtp_teid;
} pdusession_tobe_added_t;
typedef struct pdusession_admitted_tobe_added_s { typedef struct pdusession_admitted_tobe_added_s {
/* Unique pdusession_id for the UE. */ /* Unique pdusession_id for the UE. */
uint8_t pdusession_id; uint8_t pdusession_id;
...@@ -454,7 +427,7 @@ typedef struct pdusession_failed_s { ...@@ -454,7 +427,7 @@ typedef struct pdusession_failed_s {
uint8_t pdusession_id; uint8_t pdusession_id;
/* Cause of the failure */ /* Cause of the failure */
// cause_t cause; // cause_t cause;
ngap_Cause_t cause; NGAP_Cause_PR cause;
uint8_t cause_value; uint8_t cause_value;
} pdusession_failed_t; } pdusession_failed_t;
...@@ -541,7 +514,7 @@ typedef struct ngap_deregistered_gnb_ind_s { ...@@ -541,7 +514,7 @@ typedef struct ngap_deregistered_gnb_ind_s {
*/ */
typedef struct ngap_nas_first_req_s { typedef struct ngap_nas_first_req_s {
/* UE id for initial connection to NGAP */ /* UE id for initial connection to NGAP */
uint16_t ue_initial_id; uint32_t gNB_ue_ngap_id;
/* the chosen PLMN identity as index, see TS 36.331 6.2.2 RRC Connection /* the chosen PLMN identity as index, see TS 36.331 6.2.2 RRC Connection
* Setup Complete. This index here is zero-based, unlike the standard! */ * Setup Complete. This index here is zero-based, unlike the standard! */
...@@ -551,7 +524,7 @@ typedef struct ngap_nas_first_req_s { ...@@ -551,7 +524,7 @@ typedef struct ngap_nas_first_req_s {
ngap_rrc_establishment_cause_t establishment_cause; ngap_rrc_establishment_cause_t establishment_cause;
/* NAS PDU */ /* NAS PDU */
ngap_nas_pdu_t nas_pdu; ngap_pdu_t nas_pdu;
/* If this flag is set NGAP layer is expecting the GUAMI. If = 0, /* If this flag is set NGAP layer is expecting the GUAMI. If = 0,
* the temporary s-tmsi is used. * the temporary s-tmsi is used.
...@@ -561,15 +534,14 @@ typedef struct ngap_nas_first_req_s { ...@@ -561,15 +534,14 @@ typedef struct ngap_nas_first_req_s {
typedef struct ngap_uplink_nas_s { typedef struct ngap_uplink_nas_s {
/* Unique UE identifier within an gNB */ /* Unique UE identifier within an gNB */
uint32_t gNB_ue_ngap_id; uint32_t gNB_ue_ngap_id;
/* NAS pdu */ /* NAS pdu */
ngap_nas_pdu_t nas_pdu; ngap_pdu_t nas_pdu;
} ngap_uplink_nas_t; } ngap_uplink_nas_t;
typedef struct ngap_ue_cap_info_ind_s { typedef struct ngap_ue_cap_info_ind_s {
uint32_t gNB_ue_ngap_id; uint32_t gNB_ue_ngap_id;
ngap_ue_radio_cap_t ue_radio_cap; ngap_pdu_t ue_radio_cap;
} ngap_ue_cap_info_ind_t; } ngap_ue_cap_info_ind_t;
typedef struct ngap_initial_context_setup_resp_s { typedef struct ngap_initial_context_setup_resp_s {
...@@ -594,7 +566,7 @@ typedef struct ngap_initial_context_setup_fail_s { ...@@ -594,7 +566,7 @@ typedef struct ngap_initial_context_setup_fail_s {
typedef struct ngap_nas_non_delivery_ind_s { typedef struct ngap_nas_non_delivery_ind_s {
uint32_t gNB_ue_ngap_id; uint32_t gNB_ue_ngap_id;
ngap_nas_pdu_t nas_pdu; ngap_pdu_t nas_pdu;
/* TODO: add cause */ /* TODO: add cause */
} ngap_nas_non_delivery_ind_t; } ngap_nas_non_delivery_ind_t;
...@@ -621,30 +593,21 @@ typedef struct ngap_ue_ctxt_modification_resp_s { ...@@ -621,30 +593,21 @@ typedef struct ngap_ue_ctxt_modification_resp_s {
} ngap_ue_ctxt_modification_resp_t; } ngap_ue_ctxt_modification_resp_t;
typedef struct ngap_ue_release_complete_s { typedef struct ngap_ue_release_complete_s {
uint32_t gNB_ue_ngap_id; uint32_t gNB_ue_ngap_id;
} ngap_ue_release_complete_t; } ngap_ue_release_complete_t;
//-------------------------------------------------------------------------------------------// //-------------------------------------------------------------------------------------------//
// NGAP -> RRC messages // NGAP -> RRC messages
typedef struct ngap_downlink_nas_s { typedef struct ngap_downlink_nas_s {
/* UE id for initial connection to NGAP */ /* UE id for initial connection to NGAP */
uint16_t ue_initial_id; uint32_t gNB_ue_ngap_id;
/* Unique UE identifier within an gNB */
uint32_t gNB_ue_ngap_id;
/* NAS pdu */ /* NAS pdu */
ngap_nas_pdu_t nas_pdu; ngap_pdu_t nas_pdu;
} ngap_downlink_nas_t; } ngap_downlink_nas_t;
typedef struct ngap_initial_context_setup_req_s { typedef struct ngap_initial_context_setup_req_s {
/* UE id for initial connection to NGAP */ /* UE id for initial connection to NGAP */
uint16_t ue_initial_id;
/* gNB ue ngap id as initialized by NGAP layer */
uint32_t gNB_ue_ngap_id; uint32_t gNB_ue_ngap_id;
uint64_t amf_ue_ngap_id:40; uint64_t amf_ue_ngap_id:40;
...@@ -676,7 +639,7 @@ typedef struct ngap_initial_context_setup_req_s { ...@@ -676,7 +639,7 @@ typedef struct ngap_initial_context_setup_req_s {
/* Nas Pdu */ /* Nas Pdu */
uint8_t nas_pdu_flag; uint8_t nas_pdu_flag;
ngap_nas_pdu_t nas_pdu; ngap_pdu_t nas_pdu;
} ngap_initial_context_setup_req_t; } ngap_initial_context_setup_req_t;
...@@ -704,14 +667,11 @@ typedef struct ngap_paging_ind_s { ...@@ -704,14 +667,11 @@ typedef struct ngap_paging_ind_s {
typedef struct ngap_pdusession_setup_req_s { typedef struct ngap_pdusession_setup_req_s {
/* UE id for initial connection to NGAP */ /* UE id for initial connection to NGAP */
uint16_t ue_initial_id; uint32_t gNB_ue_ngap_id;
/* AMF UE id */ /* AMF UE id */
uint64_t amf_ue_ngap_id:40; uint64_t amf_ue_ngap_id:40;
/* gNB ue ngap id as initialized by NGAP layer */
uint32_t gNB_ue_ngap_id;
/* S-NSSAI */ /* S-NSSAI */
ngap_allowed_NSSAI_t allowed_nssai[8]; ngap_allowed_NSSAI_t allowed_nssai[8];
...@@ -730,8 +690,7 @@ typedef struct ngap_pdusession_setup_req_s { ...@@ -730,8 +690,7 @@ typedef struct ngap_pdusession_setup_req_s {
} ngap_pdusession_setup_req_t; } ngap_pdusession_setup_req_t;
typedef struct ngap_pdusession_setup_resp_s { typedef struct ngap_pdusession_setup_resp_s {
uint32_t gNB_ue_ngap_id; uint32_t gNB_ue_ngap_id;
/* Number of pdusession setup-ed in the list */ /* Number of pdusession setup-ed in the list */
uint8_t nb_of_pdusessions; uint8_t nb_of_pdusessions;
/* list of pdusession setup-ed by RRC layers */ /* list of pdusession setup-ed by RRC layers */
...@@ -744,7 +703,6 @@ typedef struct ngap_pdusession_setup_resp_s { ...@@ -744,7 +703,6 @@ typedef struct ngap_pdusession_setup_resp_s {
} ngap_pdusession_setup_resp_t; } ngap_pdusession_setup_resp_t;
typedef struct ngap_path_switch_req_s { typedef struct ngap_path_switch_req_s {
uint32_t gNB_ue_ngap_id; uint32_t gNB_ue_ngap_id;
/* Number of pdusession setup-ed in the list */ /* Number of pdusession setup-ed in the list */
...@@ -759,8 +717,7 @@ typedef struct ngap_path_switch_req_s { ...@@ -759,8 +717,7 @@ typedef struct ngap_path_switch_req_s {
ngap_guami_t ue_guami; ngap_guami_t ue_guami;
uint16_t ue_initial_id; uint16_t ue_initial_id;
/* Security algorithms */
/* Security algorithms */
ngap_security_capabilities_t security_capabilities; ngap_security_capabilities_t security_capabilities;
} ngap_path_switch_req_t; } ngap_path_switch_req_t;
...@@ -830,10 +787,7 @@ typedef struct ngap_ue_release_command_s { ...@@ -830,10 +787,7 @@ typedef struct ngap_ue_release_command_s {
typedef struct pdusession_release_s { typedef struct pdusession_release_s {
/* Unique pdusession_id for the UE. */ /* Unique pdusession_id for the UE. */
uint8_t pdusession_id; uint8_t pdusession_id;
/* Octet string data */ ngap_pdu_t data;
uint8_t *transfer_buffer;
/* Length of the octet string */
uint32_t transfer_length;
} pdusession_release_t; } pdusession_release_t;
typedef struct ngap_ue_release_req_s { typedef struct ngap_ue_release_req_s {
...@@ -842,14 +796,11 @@ typedef struct ngap_ue_release_req_s { ...@@ -842,14 +796,11 @@ typedef struct ngap_ue_release_req_s {
uint8_t nb_of_pdusessions; uint8_t nb_of_pdusessions;
/* list of pdusession resource by RRC layers */ /* list of pdusession resource by RRC layers */
pdusession_release_t pdusessions[NGAP_MAX_PDUSESSION]; pdusession_release_t pdusessions[NGAP_MAX_PDUSESSION];
ngap_Cause_t cause; NGAP_Cause_PR cause;
long cause_value; long cause_value;
} ngap_ue_release_req_t, ngap_ue_release_resp_t; } ngap_ue_release_req_t, ngap_ue_release_resp_t;
typedef struct ngap_pdusession_modify_req_s { typedef struct ngap_pdusession_modify_req_s {
/* UE id for initial connection to NGAP */
uint16_t ue_initial_id;
/* AMF UE id */ /* AMF UE id */
uint64_t amf_ue_ngap_id:40; uint64_t amf_ue_ngap_id:40;
...@@ -885,7 +836,7 @@ typedef struct ngap_pdusession_release_command_s { ...@@ -885,7 +836,7 @@ typedef struct ngap_pdusession_release_command_s {
uint32_t gNB_ue_ngap_id; uint32_t gNB_ue_ngap_id;
/* The NAS PDU should be forwarded by the RRC layer to the NAS layer */ /* The NAS PDU should be forwarded by the RRC layer to the NAS layer */
ngap_nas_pdu_t nas_pdu; ngap_pdu_t nas_pdu;
/* Number of pdusession to be released in the list */ /* Number of pdusession to be released in the list */
uint8_t nb_pdusessions_torelease; uint8_t nb_pdusessions_torelease;
......
openair2/E1AP/CMakeLists.txt
View file @ a5975312
...@@ -3,5 +3,5 @@ add_subdirectory(MESSAGES) ...@@ -3,5 +3,5 @@ add_subdirectory(MESSAGES)
add_library(e1ap e1ap.c e1ap_common.c e1ap_api.c) add_library(e1ap e1ap.c e1ap_common.c e1ap_api.c)
target_link_libraries(e1ap target_link_libraries(e1ap
PUBLIC asn1_e1ap f1ap PUBLIC asn1_e1ap f1ap
PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_f1ap UTIL e1_pdcp_if e1_if) PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_f1ap UTIL e1_pdcp_if e1_if asn1_ngap)
target_include_directories(e1ap PUBLIC ${CMAKE_CURRENT_DIR}) target_include_directories(e1ap PUBLIC ${CMAKE_CURRENT_DIR})
openair2/RRC/NR/cucp_cuup_direct.c
View file @ a5975312
...@@ -107,17 +107,17 @@ static int drb_config_gtpu_create(const protocol_ctxt_t *const ctxt_p, ...@@ -107,17 +107,17 @@ static int drb_config_gtpu_create(const protocol_ctxt_t *const ctxt_p,
gtpv1u_gnb_create_tunnel_req_t create_tunnel_req={0}; gtpv1u_gnb_create_tunnel_req_t create_tunnel_req={0};
gtpv1u_gnb_create_tunnel_resp_t create_tunnel_resp={0}; gtpv1u_gnb_create_tunnel_resp_t create_tunnel_resp={0};
LOG_W(NR_RRC, "recreate existing tunnels, while adding new ones\n");
int i = ue_context_p->ue_context.nb_of_pdusessions - 1; for (int i = 0; i < ue_context_p->ue_context.nb_of_pdusessions; i++) {
pdu_session_param_t *pdu = ue_context_p->ue_context.pduSession + i; rrc_pdu_session_param_t *pdu = ue_context_p->ue_context.pduSession + i;
create_tunnel_req.pdusession_id[0] = pdu->param.pdusession_id; create_tunnel_req.pdusession_id[i] = pdu->param.pdusession_id;
create_tunnel_req.incoming_rb_id[0] = i + 1; create_tunnel_req.incoming_rb_id[i] = i + 1;
create_tunnel_req.outgoing_qfi[0] = req->pduSession[i].DRBnGRanList[0].qosFlows[0].id; create_tunnel_req.outgoing_qfi[i] = req->pduSession[i].DRBnGRanList[0].qosFlows[0].id;
memcpy(&create_tunnel_req.dst_addr[0].buffer, &pdu->param.upf_addr.buffer, sizeof(create_tunnel_req.dst_addr[0].buffer)); memcpy(&create_tunnel_req.dst_addr[i].buffer, &pdu->param.upf_addr.buffer, sizeof(create_tunnel_req.dst_addr[0].buffer));
create_tunnel_req.dst_addr[0].length = pdu->param.upf_addr.length; create_tunnel_req.dst_addr[i].length = pdu->param.upf_addr.length;
create_tunnel_req.outgoing_teid[0] = pdu->param.gtp_teid; create_tunnel_req.outgoing_teid[i] = pdu->param.gtp_teid;
}
create_tunnel_req.num_tunnels = 1; create_tunnel_req.num_tunnels = ue_context_p->ue_context.nb_of_pdusessions;
create_tunnel_req.ue_id = ue_context_p->ue_context.rnti; create_tunnel_req.ue_id = ue_context_p->ue_context.rnti;
int ret = gtpv1u_create_ngu_tunnel(getCxtE1(instance)->gtpInstN3, &create_tunnel_req, &create_tunnel_resp); int ret = gtpv1u_create_ngu_tunnel(getCxtE1(instance)->gtpInstN3, &create_tunnel_req, &create_tunnel_resp);
...@@ -127,7 +127,7 @@ static int drb_config_gtpu_create(const protocol_ctxt_t *const ctxt_p, ...@@ -127,7 +127,7 @@ static int drb_config_gtpu_create(const protocol_ctxt_t *const ctxt_p,
return ret; return ret;
} }
nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(ctxt_p, &create_tunnel_resp, i); nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(ctxt_p, &create_tunnel_resp, 0);
uint8_t *kRRCenc = NULL; uint8_t *kRRCenc = NULL;
uint8_t *kRRCint = NULL; uint8_t *kRRCint = NULL;
......
openair2/RRC/NR/nr_rrc_defs.h
View file @ a5975312
...@@ -267,9 +267,12 @@ typedef struct pdu_session_param_s { ...@@ -267,9 +267,12 @@ typedef struct pdu_session_param_s {
pdusession_t param; pdusession_t param;
uint8_t status; uint8_t status;
uint8_t xid; // transaction_id uint8_t xid; // transaction_id
ngap_Cause_t cause; NGAP_Cause_PR cause;
uint8_t cause_value; uint8_t cause_value;
} __attribute__ ((__packed__)) pdu_session_param_t; ngap_pdu_t nas_pdu;
ngap_pdu_t pdusessionTransfer;
} rrc_pdu_session_param_t;
typedef struct gNB_RRC_UE_s { typedef struct gNB_RRC_UE_s {
uint8_t primaryCC_id; uint8_t primaryCC_id;
...@@ -281,8 +284,7 @@ typedef struct gNB_RRC_UE_s { ...@@ -281,8 +284,7 @@ typedef struct gNB_RRC_UE_s {
uint8_t DRB_active[NGAP_MAX_DRBS_PER_UE]; uint8_t DRB_active[NGAP_MAX_DRBS_PER_UE];
NR_SRB_INFO SI; NR_SRB_INFO SI;
NR_SRB_INFO_TABLE_ENTRY Srb1; NR_SRB_INFO_TABLE_ENTRY Srb[maxSRBs]; // 3gpp max is 3 SRBs, number 1..3, we waste the entry 0 for code simplicity
NR_SRB_INFO_TABLE_ENTRY Srb2;
NR_MeasConfig_t *measConfig; NR_MeasConfig_t *measConfig;
NR_HANDOVER_INFO *handover_info; NR_HANDOVER_INFO *handover_info;
NR_MeasResults_t *measResults; NR_MeasResults_t *measResults;
...@@ -350,11 +352,11 @@ typedef struct gNB_RRC_UE_s { ...@@ -350,11 +352,11 @@ typedef struct gNB_RRC_UE_s {
/* Number of e_rab to be modified in the list */ /* Number of e_rab to be modified in the list */
uint8_t nb_of_modify_pdusessions; uint8_t nb_of_modify_pdusessions;
uint8_t nb_of_failed_pdusessions; uint8_t nb_of_failed_pdusessions;
pdu_session_param_t modify_pdusession[NR_NB_RB_MAX]; rrc_pdu_session_param_t modify_pdusession[NR_NB_RB_MAX];
/* list of e_rab to be setup by RRC layers */ /* list of e_rab to be setup by RRC layers */
/* list of pdu session to be setup by RRC layers */ /* list of pdu session to be setup by RRC layers */
nr_e_rab_param_t e_rab[NB_RB_MAX];//[S1AP_MAX_E_RAB]; nr_e_rab_param_t e_rab[NB_RB_MAX];//[S1AP_MAX_E_RAB];
pdu_session_param_t pduSession[NGAP_MAX_PDU_SESSION]; rrc_pdu_session_param_t pduSession[NGAP_MAX_PDU_SESSION];
//release e_rabs //release e_rabs
uint8_t nb_release_of_e_rabs; uint8_t nb_release_of_e_rabs;
e_rab_failed_t e_rabs_release_failed[S1AP_MAX_E_RAB]; e_rab_failed_t e_rabs_release_failed[S1AP_MAX_E_RAB];
...@@ -395,8 +397,7 @@ typedef struct gNB_RRC_UE_s { ...@@ -395,8 +397,7 @@ typedef struct gNB_RRC_UE_s {
struct NR_PhysicalCellGroupConfig *physicalCellGroupConfig; struct NR_PhysicalCellGroupConfig *physicalCellGroupConfig;
/* Nas Pdu */ /* Nas Pdu */
uint8_t nas_pdu_flag; ngap_pdu_t nas_pdu;
ngap_nas_pdu_t nas_pdu;
} gNB_RRC_UE_t; } gNB_RRC_UE_t;
...@@ -492,12 +493,7 @@ typedef struct gNB_RRC_INST_s { ...@@ -492,12 +493,7 @@ typedef struct gNB_RRC_INST_s {
rrc_gNB_carrier_data_t carrier; rrc_gNB_carrier_data_t carrier;
uid_allocator_t uid_allocator; uid_allocator_t uid_allocator;
RB_HEAD(rrc_nr_ue_tree_s, rrc_gNB_ue_context_s) rrc_ue_head; // ue_context tree key search by rnti RB_HEAD(rrc_nr_ue_tree_s, rrc_gNB_ue_context_s) rrc_ue_head; // ue_context tree key search by rnti
int Nb_ue; int Nb_ue;
hash_table_t *initial_id2_s1ap_ids; // key is content is rrc_ue_s1ap_ids_t
hash_table_t *s1ap_id2_s1ap_ids ; // key is content is rrc_ue_s1ap_ids_t
hash_table_t *initial_id2_ngap_ids;
hash_table_t *ngap_id2_ngap_ids ;
/// NR cell id /// NR cell id
uint64_t nr_cellid; uint64_t nr_cellid;
......
openair2/RRC/NR/rrc_gNB.c
View file @ a5975312
This diff is collapsed.
openair2/RRC/NR/rrc_gNB_NGAP.c
View file @ a5975312
This source diff could not be displayed because it is too large. You can view the blob instead.
openair2/RRC/NR/rrc_gNB_NGAP.h
View file @ a5975312
...@@ -40,18 +40,6 @@ ...@@ -40,18 +40,6 @@
#include "NR_UL-DCCH-Message.h" #include "NR_UL-DCCH-Message.h"
#include "NGAP_CauseRadioNetwork.h" #include "NGAP_CauseRadioNetwork.h"
typedef struct rrc_ue_ngap_ids_s {
/* Tree related data */
RB_ENTRY(rrc_ue_ngap_ids_s) entries;
// keys
uint16_t ue_initial_id;
uint32_t gNB_ue_ngap_id;
// value
rnti_t ue_rnti;
} rrc_ue_ngap_ids_t;
void void
rrc_gNB_send_NGAP_NAS_FIRST_REQ( rrc_gNB_send_NGAP_NAS_FIRST_REQ(
const protocol_ctxt_t *const ctxt_pP, const protocol_ctxt_t *const ctxt_pP,
...@@ -59,12 +47,7 @@ rrc_gNB_send_NGAP_NAS_FIRST_REQ( ...@@ -59,12 +47,7 @@ rrc_gNB_send_NGAP_NAS_FIRST_REQ(
NR_RRCSetupComplete_IEs_t *rrcSetupComplete NR_RRCSetupComplete_IEs_t *rrcSetupComplete
); );
int int rrc_gNB_process_NGAP_INITIAL_CONTEXT_SETUP_REQ(MessageDef *msg_p, instance_t instance);
rrc_gNB_process_NGAP_INITIAL_CONTEXT_SETUP_REQ(
MessageDef *msg_p,
const char *msg_name,
instance_t instance
);
void void
rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP( rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP(
...@@ -72,20 +55,7 @@ rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP( ...@@ -72,20 +55,7 @@ rrc_gNB_send_NGAP_INITIAL_CONTEXT_SETUP_RESP(
rrc_gNB_ue_context_t *const ue_context_pP rrc_gNB_ue_context_t *const ue_context_pP
); );
int int rrc_gNB_process_NGAP_DOWNLINK_NAS(MessageDef *msg_p, instance_t instance, mui_t *rrc_gNB_mui);
rrc_gNB_process_security(
const protocol_ctxt_t *const ctxt_pP,
rrc_gNB_ue_context_t *const ue_context_pP,
ngap_security_capabilities_t *security_capabilities_pP
);
int
rrc_gNB_process_NGAP_DOWNLINK_NAS(
MessageDef *msg_p,
const char *msg_name,
instance_t instance,
mui_t *rrc_gNB_mui
);
void void
rrc_gNB_send_NGAP_UPLINK_NAS( rrc_gNB_send_NGAP_UPLINK_NAS(
...@@ -101,19 +71,9 @@ rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP( ...@@ -101,19 +71,9 @@ rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP(
uint8_t xid uint8_t xid
); );
void void rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(MessageDef *msg_p, instance_t instance);
rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
MessageDef *msg_p,
const char *msg_name,
instance_t instance
);
int int rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(MessageDef *msg_p, instance_t instance);
rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
MessageDef *msg_p,
const char *msg_name,
instance_t instance
);
int int
rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP( rrc_gNB_send_NGAP_PDUSESSION_MODIFY_RESP(
...@@ -128,38 +88,13 @@ rrc_gNB_modify_dedicatedRRCReconfiguration( ...@@ -128,38 +88,13 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
rrc_gNB_ue_context_t *ue_context_pP rrc_gNB_ue_context_t *ue_context_pP
); );
void rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_REQ(const module_id_t gnb_mod_idP, const rrc_gNB_ue_context_t *const ue_context_pP, const NGAP_Cause_PR causeP, const long cause_valueP);
void int rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_REQ(MessageDef *msg_p, instance_t instance);
rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_REQ(
const module_id_t gnb_mod_idP,
const rrc_gNB_ue_context_t *const ue_context_pP,
const ngap_Cause_t causeP,
const long cause_valueP
);
int
rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_REQ (
MessageDef *msg_p,
const char *msg_name,
instance_t instance
);
int
rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_COMMAND(
MessageDef *msg_p,
const char *msg_name,
instance_t instance
);
void rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_COMPLETE( int rrc_gNB_process_NGAP_UE_CONTEXT_RELEASE_COMMAND(MessageDef *msg_p, instance_t instance);
instance_t instance,
uint32_t gNB_ue_ngap_id);
void void rrc_gNB_send_NGAP_UE_CONTEXT_RELEASE_COMPLETE(instance_t instance, uint32_t gNB_ue_ngap_id);
rrc_gNB_NGAP_remove_ue_ids(
gNB_RRC_INST *const rrc_instance_pP,
struct rrc_ue_ngap_ids_s *const ue_ids_pP
);
void void
rrc_gNB_send_NGAP_UE_CAPABILITIES_IND( rrc_gNB_send_NGAP_UE_CAPABILITIES_IND(
...@@ -168,12 +103,7 @@ rrc_gNB_send_NGAP_UE_CAPABILITIES_IND( ...@@ -168,12 +103,7 @@ rrc_gNB_send_NGAP_UE_CAPABILITIES_IND(
NR_UL_DCCH_Message_t *const ul_dcch_msg NR_UL_DCCH_Message_t *const ul_dcch_msg
); );
int int rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(MessageDef *msg_p, instance_t instance);
rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(
MessageDef *msg_p,
const char *msg_name,
instance_t instance
);
void void
rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE( rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE(
...@@ -189,17 +119,6 @@ nr_rrc_pdcp_config_security( ...@@ -189,17 +119,6 @@ nr_rrc_pdcp_config_security(
const uint8_t send_security_mode_command const uint8_t send_security_mode_command
); );
struct rrc_gNB_ue_context_s * int rrc_gNB_process_PAGING_IND(MessageDef *msg_p, instance_t instance);
rrc_gNB_get_ue_context_from_ngap_ids(
const instance_t instanceP,
const uint16_t ue_initial_idP,
const uint32_t gNB_ue_ngap_idP
);
int
rrc_gNB_process_PAGING_IND(
MessageDef *msg_p,
const char *msg_name,
instance_t instance);
#endif #endif
openair2/RRC/NR/rrc_gNB_radio_bearers.c
View file @ a5975312
...@@ -22,19 +22,16 @@ ...@@ -22,19 +22,16 @@
#include "rrc_gNB_radio_bearers.h" #include "rrc_gNB_radio_bearers.h"
#include "oai_asn1.h" #include "oai_asn1.h"
NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering) NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, rrc_pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering)
{ {
NR_DRB_ToAddMod_t *DRB_config = NULL; NR_DRB_ToAddMod_t *DRB_config = CALLOC(1, sizeof(*DRB_config));
NR_SDAP_Config_t *SDAP_config = NULL;
DRB_config = CALLOC(1, sizeof(*DRB_config));
DRB_config->drb_Identity = drb_id; DRB_config->drb_Identity = drb_id;
DRB_config->cnAssociation = CALLOC(1, sizeof(*DRB_config->cnAssociation)); asn1cCalloc(DRB_config->cnAssociation, association);
DRB_config->cnAssociation->present = NR_DRB_ToAddMod__cnAssociation_PR_sdap_Config; association->present = NR_DRB_ToAddMod__cnAssociation_PR_sdap_Config;
/* SDAP Configuration */ /* SDAP Configuration */
SDAP_config = CALLOC(1, sizeof(NR_SDAP_Config_t)); NR_SDAP_Config_t *SDAP_config = CALLOC(1, sizeof(NR_SDAP_Config_t));
SDAP_config->mappedQoS_FlowsToAdd = calloc(1, sizeof(struct NR_SDAP_Config__mappedQoS_FlowsToAdd)); asn1cCalloc(SDAP_config->mappedQoS_FlowsToAdd, sdapFlows);
SDAP_config->pdu_Session = pduSession->param.pdusession_id; SDAP_config->pdu_Session = pduSession->param.pdusession_id;
...@@ -50,7 +47,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_par ...@@ -50,7 +47,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_par
for (int qos_flow_index = 0; qos_flow_index < pduSession->param.nb_qos; qos_flow_index++) for (int qos_flow_index = 0; qos_flow_index < pduSession->param.nb_qos; qos_flow_index++)
{ {
NR_QFI_t *qfi = calloc(1, sizeof(NR_QFI_t)); asn1cSequenceAdd(sdapFlows->list, NR_QFI_t, qfi);
*qfi = pduSession->param.qos[qos_flow_index].qfi; *qfi = pduSession->param.qos[qos_flow_index].qfi;
asn1cSeqAdd(&SDAP_config->mappedQoS_FlowsToAdd->list, qfi); asn1cSeqAdd(&SDAP_config->mappedQoS_FlowsToAdd->list, qfi);
...@@ -59,44 +56,29 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_par ...@@ -59,44 +56,29 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_par
else else
pduSession->param.used_drbs[drb_id - 1] = DRB_ACTIVE; pduSession->param.used_drbs[drb_id - 1] = DRB_ACTIVE;
} }
SDAP_config->mappedQoS_FlowsToRelease = NULL; association->choice.sdap_Config = SDAP_config;
DRB_config->cnAssociation->choice.sdap_Config = SDAP_config;
/* PDCP Configuration */ /* PDCP Configuration */
DRB_config->reestablishPDCP = NULL; asn1cCalloc(DRB_config->pdcp_Config, pdcpConfig);
DRB_config->recoverPDCP = NULL; asn1cCalloc(pdcpConfig->drb, drb);
DRB_config->pdcp_Config = calloc(1, sizeof(*DRB_config->pdcp_Config));
DRB_config->pdcp_Config->drb = calloc(1,sizeof(*DRB_config->pdcp_Config->drb)); asn1cCallocOne(drb->discardTimer, NR_PDCP_Config__drb__discardTimer_infinity);
DRB_config->pdcp_Config->drb->discardTimer = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->discardTimer)); asn1cCallocOne(drb->pdcp_SN_SizeUL, NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits);
*DRB_config->pdcp_Config->drb->discardTimer = NR_PDCP_Config__drb__discardTimer_infinity; asn1cCallocOne(drb->pdcp_SN_SizeDL, NR_PDCP_Config__drb__pdcp_SN_SizeDL_len18bits);
DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL));
*DRB_config->pdcp_Config->drb->pdcp_SN_SizeUL = NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits; drb->headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL)); drb->headerCompression.choice.notUsed = 0;
*DRB_config->pdcp_Config->drb->pdcp_SN_SizeDL = NR_PDCP_Config__drb__pdcp_SN_SizeDL_len18bits;
asn1cCallocOne(pdcpConfig->t_Reordering, NR_PDCP_Config__t_Reordering_ms0);
DRB_config->pdcp_Config->drb->headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
DRB_config->pdcp_Config->drb->headerCompression.choice.notUsed = 0;
DRB_config->pdcp_Config->drb->integrityProtection = NULL;
DRB_config->pdcp_Config->drb->statusReportRequired = NULL;
DRB_config->pdcp_Config->drb->outOfOrderDelivery = NULL;
DRB_config->pdcp_Config->moreThanOneRLC = NULL;
DRB_config->pdcp_Config->t_Reordering = calloc(1, sizeof(*DRB_config->pdcp_Config->t_Reordering));
*DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms0;
DRB_config->pdcp_Config->ext1 = NULL;
if (do_drb_integrity) { if (do_drb_integrity) {
DRB_config->pdcp_Config->drb->integrityProtection = calloc(1, sizeof(*DRB_config->pdcp_Config->drb->integrityProtection)); asn1cCallocOne(drb->integrityProtection, NR_PDCP_Config__drb__integrityProtection_enabled);
*DRB_config->pdcp_Config->drb->integrityProtection = NR_PDCP_Config__drb__integrityProtection_enabled;
} }
if (!do_drb_ciphering) { if (!do_drb_ciphering) {
DRB_config->pdcp_Config->ext1 = calloc(1, sizeof(*DRB_config->pdcp_Config->ext1)); asn1cCalloc(pdcpConfig->ext1, ext1);
DRB_config->pdcp_Config->ext1->cipheringDisabled = calloc(1, sizeof(*DRB_config->pdcp_Config->ext1->cipheringDisabled)); asn1cCallocOne(ext1->cipheringDisabled, NR_PDCP_Config__ext1__cipheringDisabled_true);
*DRB_config->pdcp_Config->ext1->cipheringDisabled = NR_PDCP_Config__ext1__cipheringDisabled_true;
} }
ue->DRB_active[drb_id-1] = DRB_ACTIVE; ue->DRB_active[drb_id-1] = DRB_ACTIVE;
...@@ -104,7 +86,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_par ...@@ -104,7 +86,7 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, pdu_session_par
return DRB_config; return DRB_config;
} }
uint8_t next_available_drb(gNB_RRC_UE_t *ue, pdu_session_param_t *pdusession, bool is_gbr) uint8_t next_available_drb(gNB_RRC_UE_t *ue, rrc_pdu_session_param_t *pdusession, bool is_gbr)
{ {
uint8_t drb_id; uint8_t drb_id;
......
openair2/RRC/NR/rrc_gNB_radio_bearers.h
View file @ a5975312
...@@ -35,10 +35,8 @@ ...@@ -35,10 +35,8 @@
#define GBR_FLOW (1) #define GBR_FLOW (1)
#define NONGBR_FLOW (0) #define NONGBR_FLOW (0)
NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue, uint8_t drb_id, pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering); NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue, uint8_t drb_id, rrc_pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering);
uint8_t next_available_drb(gNB_RRC_UE_t *ue, rrc_pdu_session_param_t *pdusession, bool is_gbr);
uint8_t next_available_drb(gNB_RRC_UE_t *ue, pdu_session_param_t *pdusession, bool is_gbr);
bool drb_is_active(gNB_RRC_UE_t *ue, uint8_t drb_id); bool drb_is_active(gNB_RRC_UE_t *ue, uint8_t drb_id);
#endif #endif
openair3/NGAP/ngap_common.h
View file @ a5975312
...@@ -113,27 +113,27 @@ extern int asn1_xer_print; ...@@ -113,27 +113,27 @@ extern int asn1_xer_print;
# define NGAP_DEBUG(x, args...) do { fprintf(stdout, "[NGAP][D]"x, ##args); } while(0) # define NGAP_DEBUG(x, args...) do { fprintf(stdout, "[NGAP][D]"x, ##args); } while(0)
#endif #endif
#define NGAP_FIND_PROTOCOLIE_BY_ID(IE_TYPE, ie, container, IE_ID, mandatory) \
do { \
IE_TYPE **ptr; \
ie = NULL; \
for (ptr = container->protocolIEs.list.array; ptr < &container->protocolIEs.list.array[container->protocolIEs.list.count]; ptr++) { \
if ((*ptr)->id == IE_ID) { \
ie = *ptr; \
break; \
} \
} \
if (ie == NULL) { \
if (mandatory) { \
AssertFatal(NGAP, "NGAP_FIND_PROTOCOLIE_BY_ID ie is NULL (searching for ie: %ld)\n", IE_ID); \
} else { \
NGAP_INFO("NGAP_FIND_PROTOCOLIE_BY_ID ie is NULL (searching for ie: %ld)\n", IE_ID); \
} \
} \
} while (0); \
if (mandatory && !ie) \
return -1
#define NGAP_FIND_PROTOCOLIE_BY_ID(IE_TYPE, ie, container, IE_ID, mandatory) \
do {\
IE_TYPE **ptr; \
ie = NULL; \
for (ptr = container->protocolIEs.list.array; \
ptr < &container->protocolIEs.list.array[container->protocolIEs.list.count]; \
ptr++) { \
if((*ptr)->id == IE_ID) { \
ie = *ptr; \
break; \
} \
} \
if (ie == NULL ) { \
if (mandatory) {\
NGAP_ERROR("NGAP_FIND_PROTOCOLIE_BY_ID: %s %d: ie is NULL (searching for ie: %ld)\n",__FILE__,__LINE__, IE_ID);\
abort();\
}\
else NGAP_INFO("NGAP_FIND_PROTOCOLIE_BY_ID: %s %d: ie is NULL (searching for ie: %ld)\n",__FILE__,__LINE__, IE_ID);\
} \
} while(0)
/** \brief Function callback prototype. /** \brief Function callback prototype.
**/ **/
typedef int (*ngap_message_decoded_callback)( typedef int (*ngap_message_decoded_callback)(
......
openair3/NGAP/ngap_gNB.c
View file @ a5975312
...@@ -162,7 +162,6 @@ void ngap_gNB_handle_register_gNB(instance_t instance, ngap_register_gnb_req_t * ...@@ -162,7 +162,6 @@ void ngap_gNB_handle_register_gNB(instance_t instance, ngap_register_gnb_req_t *
} else { } else {
new_instance = calloc(1, sizeof(ngap_gNB_instance_t)); new_instance = calloc(1, sizeof(ngap_gNB_instance_t));
DevAssert(new_instance != NULL); DevAssert(new_instance != NULL);
RB_INIT(&new_instance->ngap_ue_head);
RB_INIT(&new_instance->ngap_amf_head); RB_INIT(&new_instance->ngap_amf_head);
/* Copy usefull parameters */ /* Copy usefull parameters */
new_instance->instance = instance; new_instance->instance = instance;
...@@ -276,127 +275,88 @@ void *ngap_gNB_process_itti_msg(void *notUsed) { ...@@ -276,127 +275,88 @@ void *ngap_gNB_process_itti_msg(void *notUsed) {
MessageDef *received_msg = NULL; MessageDef *received_msg = NULL;
int result; int result;
itti_receive_msg(TASK_NGAP, &received_msg); itti_receive_msg(TASK_NGAP, &received_msg);
if (received_msg) {
instance_t instance = ITTI_MSG_DESTINATION_INSTANCE(received_msg);
LOG_D(RRC, "Received message %s\n", ITTI_MSG_NAME(received_msg));
switch (ITTI_MSG_ID(received_msg)) {
case TERMINATE_MESSAGE:
NGAP_WARN(" *** Exiting NGAP thread\n");
itti_exit_task();
break;
switch (ITTI_MSG_ID(received_msg)) { case NGAP_REGISTER_GNB_REQ: {
case TERMINATE_MESSAGE: /* Register a new gNB.
NGAP_WARN(" *** Exiting NGAP thread\n"); * in Virtual mode gNBs will be distinguished using the mod_id/
itti_exit_task(); * Each gNB has to send an NGAP_REGISTER_GNB message with its
break; * own parameters.
*/
case NGAP_REGISTER_GNB_REQ: { ngap_gNB_handle_register_gNB(instance, &NGAP_REGISTER_GNB_REQ(received_msg));
/* Register a new gNB. } break;
* in Virtual mode gNBs will be distinguished using the mod_id/
* Each gNB has to send an NGAP_REGISTER_GNB message with its case SCTP_NEW_ASSOCIATION_RESP: {
* own parameters. ngap_gNB_handle_sctp_association_resp(instance, &received_msg->ittiMsg.sctp_new_association_resp);
*/ } break;
ngap_gNB_handle_register_gNB(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&NGAP_REGISTER_GNB_REQ(received_msg)); case SCTP_DATA_IND: {
} ngap_gNB_handle_sctp_data_ind(&received_msg->ittiMsg.sctp_data_ind);
break; } break;
case SCTP_NEW_ASSOCIATION_RESP: { case NGAP_NAS_FIRST_REQ: {
ngap_gNB_handle_sctp_association_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg), ngap_gNB_handle_nas_first_req(instance, &NGAP_NAS_FIRST_REQ(received_msg));
&received_msg->ittiMsg.sctp_new_association_resp); } break;
}
break; case NGAP_UPLINK_NAS: {
ngap_gNB_nas_uplink(instance, &NGAP_UPLINK_NAS(received_msg));
case SCTP_DATA_IND: { } break;
ngap_gNB_handle_sctp_data_ind(&received_msg->ittiMsg.sctp_data_ind);
} case NGAP_UE_CAPABILITIES_IND: {
break; ngap_gNB_ue_capabilities(instance, &NGAP_UE_CAPABILITIES_IND(received_msg));
} break;
case NGAP_NAS_FIRST_REQ: {
ngap_gNB_handle_nas_first_req(ITTI_MSG_DESTINATION_INSTANCE(received_msg), case NGAP_INITIAL_CONTEXT_SETUP_RESP: {
&NGAP_NAS_FIRST_REQ(received_msg)); ngap_gNB_initial_ctxt_resp(instance, &NGAP_INITIAL_CONTEXT_SETUP_RESP(received_msg));
} } break;
break;
case NGAP_PDUSESSION_SETUP_RESP: {
case NGAP_UPLINK_NAS: { ngap_gNB_pdusession_setup_resp(instance, &NGAP_PDUSESSION_SETUP_RESP(received_msg));
ngap_gNB_nas_uplink(ITTI_MSG_DESTINATION_INSTANCE(received_msg), } break;
&NGAP_UPLINK_NAS(received_msg));
} case NGAP_PDUSESSION_MODIFY_RESP: {
break; ngap_gNB_pdusession_modify_resp(instance, &NGAP_PDUSESSION_MODIFY_RESP(received_msg));
} break;
case NGAP_UE_CAPABILITIES_IND: {
ngap_gNB_ue_capabilities(ITTI_MSG_DESTINATION_INSTANCE(received_msg), case NGAP_NAS_NON_DELIVERY_IND: {
&NGAP_UE_CAPABILITIES_IND(received_msg)); ngap_gNB_nas_non_delivery_ind(instance, &NGAP_NAS_NON_DELIVERY_IND(received_msg));
} } break;
break;
case NGAP_PATH_SWITCH_REQ: {
case NGAP_INITIAL_CONTEXT_SETUP_RESP: { ngap_gNB_path_switch_req(instance, &NGAP_PATH_SWITCH_REQ(received_msg));
ngap_gNB_initial_ctxt_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg), } break;
&NGAP_INITIAL_CONTEXT_SETUP_RESP(received_msg));
} case NGAP_PDUSESSION_MODIFICATION_IND: {
break; ngap_gNB_generate_PDUSESSION_Modification_Indication(instance, &NGAP_PDUSESSION_MODIFICATION_IND(received_msg));
} break;
case NGAP_PDUSESSION_SETUP_RESP: {
ngap_gNB_pdusession_setup_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg), case NGAP_UE_CONTEXT_RELEASE_COMPLETE: {
&NGAP_PDUSESSION_SETUP_RESP(received_msg)); ngap_ue_context_release_complete(instance, &NGAP_UE_CONTEXT_RELEASE_COMPLETE(received_msg));
} } break;
break;
case NGAP_UE_CONTEXT_RELEASE_REQ: {
case NGAP_PDUSESSION_MODIFY_RESP: { ngap_ue_context_release_req(instance, &NGAP_UE_CONTEXT_RELEASE_REQ(received_msg));
ngap_gNB_pdusession_modify_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg), } break;
&NGAP_PDUSESSION_MODIFY_RESP(received_msg));
} case NGAP_PDUSESSION_RELEASE_RESPONSE: {
break; ngap_gNB_pdusession_release_resp(instance, &NGAP_PDUSESSION_RELEASE_RESPONSE(received_msg));
} break;
case NGAP_NAS_NON_DELIVERY_IND: {
ngap_gNB_nas_non_delivery_ind(ITTI_MSG_DESTINATION_INSTANCE(received_msg), default:
&NGAP_NAS_NON_DELIVERY_IND(received_msg)); NGAP_ERROR("Received unhandled message: %d:%s\n", ITTI_MSG_ID(received_msg), ITTI_MSG_NAME(received_msg));
} break;
break;
case NGAP_PATH_SWITCH_REQ: {
ngap_gNB_path_switch_req(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&NGAP_PATH_SWITCH_REQ(received_msg));
}
break;
case NGAP_PDUSESSION_MODIFICATION_IND: {
ngap_gNB_generate_PDUSESSION_Modification_Indication(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&NGAP_PDUSESSION_MODIFICATION_IND(received_msg));
}
break;
case NGAP_UE_CONTEXT_RELEASE_COMPLETE: {
ngap_ue_context_release_complete(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&NGAP_UE_CONTEXT_RELEASE_COMPLETE(received_msg));
}
break;
case NGAP_UE_CONTEXT_RELEASE_REQ: {
ngap_gNB_instance_t *ngap_gNB_instance_p = NULL; // test
struct ngap_gNB_ue_context_s *ue_context_p = NULL; // test
ngap_ue_context_release_req(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&NGAP_UE_CONTEXT_RELEASE_REQ(received_msg));
ngap_gNB_instance_p = ngap_gNB_get_instance(ITTI_MSG_DESTINATION_INSTANCE(received_msg)); // test
DevAssert(ngap_gNB_instance_p != NULL); // test
if ((ue_context_p = ngap_gNB_get_ue_context(ngap_gNB_instance_p,
NGAP_UE_CONTEXT_RELEASE_REQ(received_msg).gNB_ue_ngap_id)) == NULL) { // test
/* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
NGAP_ERROR("Failed to find ue context associated with gNB ue ngap id: %u\n",
NGAP_UE_CONTEXT_RELEASE_REQ(received_msg).gNB_ue_ngap_id); // test
} // test
}
break;
case NGAP_PDUSESSION_RELEASE_RESPONSE: {
ngap_gNB_pdusession_release_resp(ITTI_MSG_DESTINATION_INSTANCE(received_msg),
&NGAP_PDUSESSION_RELEASE_RESPONSE(received_msg));
} }
break;
default: result = itti_free(ITTI_MSG_ORIGIN_ID(received_msg), received_msg);
NGAP_ERROR("Received unhandled message: %d:%s\n", AssertFatal(result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
ITTI_MSG_ID(received_msg), ITTI_MSG_NAME(received_msg));
break;
} }
result = itti_free (ITTI_MSG_ORIGIN_ID(received_msg), received_msg);
AssertFatal (result == EXIT_SUCCESS, "Failed to free memory (%d)!\n", result);
received_msg = NULL;
return NULL; return NULL;
} }
......
openair3/NGAP/ngap_gNB_decoder.c
View file @ a5975312
...@@ -156,13 +156,8 @@ int ngap_gNB_decode_pdu(NGAP_NGAP_PDU_t *pdu, const uint8_t *const buffer, ...@@ -156,13 +156,8 @@ int ngap_gNB_decode_pdu(NGAP_NGAP_PDU_t *pdu, const uint8_t *const buffer,
asn_dec_rval_t dec_ret; asn_dec_rval_t dec_ret;
DevAssert(pdu != NULL); DevAssert(pdu != NULL);
DevAssert(buffer != NULL); DevAssert(buffer != NULL);
dec_ret = aper_decode(NULL, asn_codec_ctx_t st = {.max_stack_size = 100 * 1000}; // if we enable asn1c debug the stack size become large
&asn_DEF_NGAP_NGAP_PDU, dec_ret = aper_decode(&st, &asn_DEF_NGAP_NGAP_PDU, (void **)&pdu, buffer, length, 0, 0);
(void **)&pdu,
buffer,
length,
0,
0);
if (dec_ret.code != RC_OK) { if (dec_ret.code != RC_OK) {
NGAP_ERROR("Failed to decode pdu\n"); NGAP_ERROR("Failed to decode pdu\n");
......
openair3/NGAP/ngap_gNB_defs.h
View file @ a5975312
...@@ -236,11 +236,6 @@ typedef struct ngap_gNB_instance_s { ...@@ -236,11 +236,6 @@ typedef struct ngap_gNB_instance_s {
/* Tree of NGAP AMF associations ordered by association ID */ /* Tree of NGAP AMF associations ordered by association ID */
RB_HEAD(ngap_amf_map, ngap_gNB_amf_data_s) ngap_amf_head; RB_HEAD(ngap_amf_map, ngap_gNB_amf_data_s) ngap_amf_head;
/* TODO: add a map ordered by relative AMF capacity */
/* Tree of UE ordered by gNB_ue_ngap_id's */
RB_HEAD(ngap_ue_map, ngap_gNB_ue_context_s) ngap_ue_head;
/* For virtual mode, mod_id as defined in the rest of the L1/L2 stack */ /* For virtual mode, mod_id as defined in the rest of the L1/L2 stack */
instance_t instance; instance_t instance;
......
openair3/NGAP/ngap_gNB_encoder.c
View file @ a5975312
...@@ -38,186 +38,98 @@ ...@@ -38,186 +38,98 @@
#include "ngap_common.h" #include "ngap_common.h"
#include "ngap_gNB_encoder.h" #include "ngap_gNB_encoder.h"
static inline int ngap_gNB_encode_initiating(NGAP_NGAP_PDU_t *pdu, static inline int ngap_gNB_encode_initiating(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
uint8_t **buffer, {
uint32_t *len);
static inline int ngap_gNB_encode_successfull_outcome(NGAP_NGAP_PDU_t *pdu,
uint8_t **buffer, uint32_t *len);
static inline int ngap_gNB_encode_unsuccessfull_outcome(NGAP_NGAP_PDU_t *pdu,
uint8_t **buffer, uint32_t *len);
int ngap_gNB_encode_pdu(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len) {
int ret = -1;
DevAssert(pdu != NULL); DevAssert(pdu != NULL);
DevAssert(buffer != NULL);
DevAssert(len != NULL);
switch(pdu->present) {
case NGAP_NGAP_PDU_PR_initiatingMessage:
ret = ngap_gNB_encode_initiating(pdu, buffer, len);
break;
case NGAP_NGAP_PDU_PR_successfulOutcome:
ret = ngap_gNB_encode_successfull_outcome(pdu, buffer, len);
break;
case NGAP_NGAP_PDU_PR_unsuccessfulOutcome: const NGAP_ProcedureCode_t tmp[] = {NGAP_ProcedureCode_id_NGSetup,
ret = ngap_gNB_encode_unsuccessfull_outcome(pdu, buffer, len); NGAP_ProcedureCode_id_UplinkNASTransport,
break; NGAP_ProcedureCode_id_UERadioCapabilityInfoIndication,
NGAP_ProcedureCode_id_InitialUEMessage,
default: NGAP_ProcedureCode_id_NASNonDeliveryIndication,
NGAP_DEBUG("Unknown message outcome (%d) or not implemented", NGAP_ProcedureCode_id_UEContextReleaseRequest,
(int)pdu->present); NGAP_ProcedureCode_id_PathSwitchRequest,
return -1; NGAP_ProcedureCode_id_PDUSessionResourceModifyIndication};
int i;
for (i = 0; i < sizeofArray(tmp); i++)
if (pdu->choice.initiatingMessage->procedureCode == tmp[i])
break;
if (i == sizeofArray(tmp)) {
NGAP_DEBUG("Unknown procedure ID (%d) for initiating message\n", (int)pdu->choice.initiatingMessage->procedureCode);
return -1;
} }
//ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, pdu); asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
return ret; *buffer = res.buffer;
*len = res.result.encoded;
return 0;
} }
static inline static inline int ngap_gNB_encode_successfull_outcome(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
int ngap_gNB_encode_initiating(NGAP_NGAP_PDU_t *pdu, {
uint8_t **buffer, uint32_t *len) {
asn_encode_to_new_buffer_result_t res = { NULL, {0, NULL, NULL} };
DevAssert(pdu != NULL); DevAssert(pdu != NULL);
const NGAP_ProcedureCode_t tmp[] = {NGAP_ProcedureCode_id_InitialContextSetup,
switch(pdu->choice.initiatingMessage->procedureCode) { NGAP_ProcedureCode_id_UEContextRelease,
case NGAP_ProcedureCode_id_NGSetup: NGAP_ProcedureCode_id_PDUSessionResourceSetup,
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu); NGAP_ProcedureCode_id_PDUSessionResourceModify,
free(res.buffer); NGAP_ProcedureCode_id_PDUSessionResourceRelease};
break; int i;
for (i = 0; i < sizeofArray(tmp); i++)
case NGAP_ProcedureCode_id_UplinkNASTransport: if (pdu->choice.successfulOutcome->procedureCode == tmp[i])
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu); break;
free(res.buffer); if (i == sizeofArray(tmp)) {
break; NGAP_WARN("Unknown procedure ID (%d) for successfull outcome message\n", (int)pdu->choice.successfulOutcome->procedureCode);
return -1;
case NGAP_ProcedureCode_id_UERadioCapabilityInfoIndication:
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
free(res.buffer);
break;
case NGAP_ProcedureCode_id_InitialUEMessage:
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
free(res.buffer);
break;
case NGAP_ProcedureCode_id_NASNonDeliveryIndication:
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
free(res.buffer);
break;
case NGAP_ProcedureCode_id_UEContextReleaseRequest:
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
free(res.buffer);
break;
case NGAP_ProcedureCode_id_PathSwitchRequest:
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
free(res.buffer);
break;
case NGAP_ProcedureCode_id_PDUSessionResourceModifyIndication:
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
free(res.buffer);
break;
default:
NGAP_DEBUG("Unknown procedure ID (%d) for initiating message\n",
(int)pdu->choice.initiatingMessage->procedureCode);
return -1;
} }
if (asn1_xer_print) { asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, (void *)pdu);
}
memset(&res, 0, sizeof(res));
res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
*buffer = res.buffer; *buffer = res.buffer;
*len = res.result.encoded; *len = res.result.encoded;
return 0; return 0;
} }
static inline static inline int ngap_gNB_encode_unsuccessfull_outcome(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
int ngap_gNB_encode_successfull_outcome(NGAP_NGAP_PDU_t *pdu, {
uint8_t **buffer, uint32_t *len) {
asn_encode_to_new_buffer_result_t res = { NULL, {0, NULL, NULL} };
DevAssert(pdu != NULL); DevAssert(pdu != NULL);
switch(pdu->choice.successfulOutcome->procedureCode) { if (pdu->choice.unsuccessfulOutcome->procedureCode != NGAP_ProcedureCode_id_InitialContextSetup) {
case NGAP_ProcedureCode_id_InitialContextSetup: NGAP_DEBUG("Unknown procedure ID (%d) for unsuccessfull outcome message\n", (int)pdu->choice.unsuccessfulOutcome->procedureCode);
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu); return -1;
free(res.buffer);
break;
case NGAP_ProcedureCode_id_UEContextRelease:
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
free(res.buffer);
break;
case NGAP_ProcedureCode_id_PDUSessionResourceSetup:
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
free(res.buffer);
NGAP_INFO("PDUSESSIONSetup successful message\n");
break;
case NGAP_ProcedureCode_id_PDUSessionResourceModify:
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
free(res.buffer);
NGAP_INFO("PDUSESSIONModify successful message\n");
break;
case NGAP_ProcedureCode_id_PDUSessionResourceRelease:
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu);
free(res.buffer);
NGAP_INFO("PDUSESSION Release successful message\n");
break;
default:
NGAP_WARN("Unknown procedure ID (%d) for successfull outcome message\n",
(int)pdu->choice.successfulOutcome->procedureCode);
return -1;
} }
if (asn1_xer_print) { asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, (void *)pdu);
}
memset(&res, 0, sizeof(res));
res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
*buffer = res.buffer; *buffer = res.buffer;
*len = res.result.encoded; *len = res.result.encoded;
return 0; return 0;
} }
static inline int ngap_gNB_encode_pdu(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
int ngap_gNB_encode_unsuccessfull_outcome(NGAP_NGAP_PDU_t *pdu, {
uint8_t **buffer, uint32_t *len) { int ret = -1;
asn_encode_to_new_buffer_result_t res = { NULL, {0, NULL, NULL} };
DevAssert(pdu != NULL); DevAssert(pdu != NULL);
DevAssert(buffer != NULL);
DevAssert(len != NULL);
if (asn1_xer_print) {
xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, (void *)pdu);
}
switch (pdu->present) {
case NGAP_NGAP_PDU_PR_initiatingMessage:
ret = ngap_gNB_encode_initiating(pdu, buffer, len);
break;
switch(pdu->choice.unsuccessfulOutcome->procedureCode) { case NGAP_NGAP_PDU_PR_successfulOutcome:
case NGAP_ProcedureCode_id_InitialContextSetup: ret = ngap_gNB_encode_successfull_outcome(pdu, buffer, len);
res = asn_encode_to_new_buffer(NULL, ATS_CANONICAL_XER, &asn_DEF_NGAP_NGAP_PDU, pdu); break;
free(res.buffer);
case NGAP_NGAP_PDU_PR_unsuccessfulOutcome:
ret = ngap_gNB_encode_unsuccessfull_outcome(pdu, buffer, len);
break; break;
default: default:
NGAP_DEBUG("Unknown procedure ID (%d) for unsuccessfull outcome message\n", NGAP_DEBUG("Unknown message outcome (%d) or not implemented", (int)pdu->present);
(int)pdu->choice.unsuccessfulOutcome->procedureCode);
return -1; return -1;
} }
if (asn1_xer_print) { ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, pdu);
xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, (void *)pdu); return ret;
}
memset(&res, 0, sizeof(res));
res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
*buffer = res.buffer;
*len = res.result.encoded;
return 0;
} }
openair3/NGAP/ngap_gNB_handlers.c
View file @ a5975312
This diff is collapsed.
openair3/NGAP/ngap_gNB_itti_messaging.c
View file @ a5975312
...@@ -49,11 +49,7 @@ void ngap_gNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uin ...@@ -49,11 +49,7 @@ void ngap_gNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uin
itti_send_msg_to_task(TASK_SCTP, instance, message_p); itti_send_msg_to_task(TASK_SCTP, instance, message_p);
} }
void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance, void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance, uint32_t gNB_ue_ngap_id, uint8_t *nas_pdu, uint32_t nas_pdu_length)
uint16_t ue_initial_id,
uint32_t gNB_ue_ngap_id,
uint8_t *nas_pdu,
uint32_t nas_pdu_length)
{ {
MessageDef *message_p; MessageDef *message_p;
ngap_downlink_nas_t *ngap_downlink_nas; ngap_downlink_nas_t *ngap_downlink_nas;
...@@ -62,7 +58,6 @@ void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance, ...@@ -62,7 +58,6 @@ void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance,
ngap_downlink_nas = &message_p->ittiMsg.ngap_downlink_nas; ngap_downlink_nas = &message_p->ittiMsg.ngap_downlink_nas;
ngap_downlink_nas->ue_initial_id = ue_initial_id;
ngap_downlink_nas->gNB_ue_ngap_id = gNB_ue_ngap_id; ngap_downlink_nas->gNB_ue_ngap_id = gNB_ue_ngap_id;
ngap_downlink_nas->nas_pdu.buffer = malloc(sizeof(uint8_t) * nas_pdu_length); ngap_downlink_nas->nas_pdu.buffer = malloc(sizeof(uint8_t) * nas_pdu_length);
memcpy(ngap_downlink_nas->nas_pdu.buffer, nas_pdu, nas_pdu_length); memcpy(ngap_downlink_nas->nas_pdu.buffer, nas_pdu, nas_pdu_length);
......
openair3/NGAP/ngap_gNB_itti_messaging.h
View file @ a5975312
...@@ -33,11 +33,7 @@ ...@@ -33,11 +33,7 @@
void ngap_gNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer, void ngap_gNB_itti_send_sctp_data_req(instance_t instance, int32_t assoc_id, uint8_t *buffer,
uint32_t buffer_length, uint16_t stream); uint32_t buffer_length, uint16_t stream);
void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance, void ngap_gNB_itti_send_nas_downlink_ind(instance_t instance, uint32_t gNB_ue_ngap_id, uint8_t *nas_pdu, uint32_t nas_pdu_length);
uint16_t ue_initial_id,
uint32_t gNB_ue_ngap_id,
uint8_t *nas_pdu,
uint32_t nas_pdu_length);
void ngap_gNB_itti_send_sctp_close_association(instance_t instance, void ngap_gNB_itti_send_sctp_close_association(instance_t instance,
int32_t assoc_id); int32_t assoc_id);
......
openair3/NGAP/ngap_gNB_nas_procedures.c
View file @ a5975312
This diff is collapsed.
openair3/NGAP/ngap_gNB_trace.h
View file @ a5975312
...@@ -30,23 +30,10 @@ ...@@ -30,23 +30,10 @@
#ifndef NGAP_GNB_TRACE_H_ #ifndef NGAP_GNB_TRACE_H_
#define NGAP_GNB_TRACE_H_ #define NGAP_GNB_TRACE_H_
// int ngap_gNB_generate_trace_failure(sctp_data_t *sctp_data_p,
// int32_t stream,
// uint32_t gNB_ue_ngap_id,
// uint32_t amf_ue_ngap_id,
// E_UTRAN_Trace_ID_t *trace_id,
// Cause_t *cause_p);
// int ngap_gNB_handle_trace_start(gNB_amf_desc_t *gNB_desc_p,
// sctp_queue_item_t *packet_p,
// struct ngap_message_s *message_p);
int ngap_gNB_handle_trace_start(uint32_t assoc_id, int ngap_gNB_handle_trace_start(uint32_t assoc_id,
uint32_t stream, uint32_t stream,
NGAP_NGAP_PDU_t *pdu); NGAP_NGAP_PDU_t *pdu);
// int ngap_gNB_handle_deactivate_trace(gNB_amf_desc_t *gNB_desc_p,
// sctp_queue_item_t *packet_p,
// struct ngap_message_s *message_p);
int ngap_gNB_handle_deactivate_trace(uint32_t assoc_id, int ngap_gNB_handle_deactivate_trace(uint32_t assoc_id,
uint32_t stream, uint32_t stream,
NGAP_NGAP_PDU_t *pdu); NGAP_NGAP_PDU_t *pdu);
......
openair3/NGAP/ngap_gNB_ue_context.c
View file @ a5975312
...@@ -40,8 +40,15 @@ ...@@ -40,8 +40,15 @@
#include "ngap_gNB_defs.h" #include "ngap_gNB_defs.h"
#include "ngap_gNB_ue_context.h" #include "ngap_gNB_ue_context.h"
int ngap_gNB_compare_gNB_ue_ngap_id( /* Tree of UE ordered by gNB_ue_ngap_id's
struct ngap_gNB_ue_context_s *p1, struct ngap_gNB_ue_context_s *p2) * NO INSTANCE, the 32 bits id is large enough to handle all UEs, regardless the cell, gNB, ...
*/
static RB_HEAD(ngap_ue_map, ngap_gNB_ue_context_s) ngap_ue_head = RB_INITIALIZER(root);
/* Generate the tree management functions prototypes */
RB_PROTOTYPE(ngap_ue_map, ngap_gNB_ue_context_s, entries, ngap_gNB_compare_gNB_ue_ngap_id);
static int ngap_gNB_compare_gNB_ue_ngap_id(struct ngap_gNB_ue_context_s *p1, struct ngap_gNB_ue_context_s *p2)
{ {
if (p1->gNB_ue_ngap_id > p2->gNB_ue_ngap_id) { if (p1->gNB_ue_ngap_id > p2->gNB_ue_ngap_id) {
return 1; return 1;
...@@ -58,46 +65,26 @@ int ngap_gNB_compare_gNB_ue_ngap_id( ...@@ -58,46 +65,26 @@ int ngap_gNB_compare_gNB_ue_ngap_id(
RB_GENERATE(ngap_ue_map, ngap_gNB_ue_context_s, entries, RB_GENERATE(ngap_ue_map, ngap_gNB_ue_context_s, entries,
ngap_gNB_compare_gNB_ue_ngap_id); ngap_gNB_compare_gNB_ue_ngap_id);
struct ngap_gNB_ue_context_s *ngap_gNB_allocate_new_UE_context(void) void ngap_store_ue_context(struct ngap_gNB_ue_context_s *ue_desc_p)
{ {
struct ngap_gNB_ue_context_s *new_p; if (!RB_INSERT(ngap_ue_map, &ngap_ue_head, ue_desc_p))
LOG_E(NGAP, "Bug in UE uniq number allocation %u, we try to add a existing UE\n", ue_desc_p->gNB_ue_ngap_id);
new_p = malloc(sizeof(struct ngap_gNB_ue_context_s)); return;
if (new_p == NULL) {
NGAP_ERROR("Cannot allocate new ue context\n");
return NULL;
}
memset(new_p, 0, sizeof(struct ngap_gNB_ue_context_s));
return new_p;
} }
struct ngap_gNB_ue_context_s *ngap_gNB_get_ue_context( struct ngap_gNB_ue_context_s *ngap_get_ue_context(uint32_t gNB_ue_ngap_id)
ngap_gNB_instance_t *instance_p,
uint32_t gNB_ue_ngap_id)
{ {
ngap_gNB_ue_context_t temp; ngap_gNB_ue_context_t temp = {.gNB_ue_ngap_id = gNB_ue_ngap_id};
return RB_FIND(ngap_ue_map, &ngap_ue_head, &temp);
memset(&temp, 0, sizeof(struct ngap_gNB_ue_context_s));
/* gNB ue ngap id = 32 bits wide */
temp.gNB_ue_ngap_id = gNB_ue_ngap_id & 0xFFFFFFFF;
return RB_FIND(ngap_ue_map, &instance_p->ngap_ue_head, &temp);
} }
void ngap_gNB_free_ue_context(struct ngap_gNB_ue_context_s *ue_context_p) struct ngap_gNB_ue_context_s *ngap_detach_ue_context(uint32_t gNB_ue_ngap_id)
{ {
if (ue_context_p == NULL) { struct ngap_gNB_ue_context_s *tmp = ngap_get_ue_context(gNB_ue_ngap_id);
NGAP_ERROR("Trying to free a NULL context\n"); if (tmp == NULL) {
return; NGAP_ERROR("Trying to free a NULL UE context, %u\n", gNB_ue_ngap_id);
return NULL;
} }
RB_REMOVE(ngap_ue_map, &ngap_ue_head, tmp);
/* TODO: check that context is currently not in the tree of known return tmp;
* contexts.
*/
free(ue_context_p);
} }
openair3/NGAP/ngap_gNB_ue_context.h
View file @ a5975312
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
// Forward declarations // Forward declarations
struct ngap_gNB_amf_data_s; struct ngap_gNB_amf_data_s;
struct ngap_ue_map;
struct gNB_amf_desc_s; struct gNB_amf_desc_s;
typedef enum { typedef enum {
...@@ -59,9 +58,6 @@ typedef struct ngap_gNB_ue_context_s { ...@@ -59,9 +58,6 @@ typedef struct ngap_gNB_ue_context_s {
*/ */
uint32_t gNB_ue_ngap_id; uint32_t gNB_ue_ngap_id;
/* UE id for initial connection to NGAP */
uint16_t ue_initial_id;
/* Uniquely identifies the UE within AMF. Encoded on 32 bits. */ /* Uniquely identifies the UE within AMF. Encoded on 32 bits. */
uint64_t amf_ue_ngap_id:40; uint64_t amf_ue_ngap_id:40;
...@@ -84,20 +80,9 @@ typedef struct ngap_gNB_ue_context_s { ...@@ -84,20 +80,9 @@ typedef struct ngap_gNB_ue_context_s {
ngap_gNB_instance_t *gNB_instance; ngap_gNB_instance_t *gNB_instance;
} ngap_gNB_ue_context_t; } ngap_gNB_ue_context_t;
int ngap_gNB_compare_gNB_ue_ngap_id( void ngap_store_ue_context(ngap_gNB_ue_context_t *ue_desc_p);
struct ngap_gNB_ue_context_s *p1, struct ngap_gNB_ue_context_s *p2);
/* Generate the tree management functions prototypes */
RB_PROTOTYPE(ngap_ue_map, ngap_gNB_ue_context_s, entries,
ngap_gNB_compare_gNB_ue_ngap_id);
struct ngap_gNB_ue_context_s *ngap_gNB_allocate_new_UE_context(void);
struct ngap_gNB_ue_context_s *ngap_gNB_get_ue_context(
ngap_gNB_instance_t *instance_p,
uint32_t gNB_ue_ngap_id);
void ngap_gNB_free_ue_context(struct ngap_gNB_ue_context_s *ue_context_p);
ngap_gNB_ue_context_t *ngap_get_ue_context(uint32_t gNB_ue_ngap_id);
ngap_gNB_ue_context_t *ngap_detach_ue_context(uint32_t gNB_ue_ngap_id);
#endif /* NGAP_GNB_UE_CONTEXT_H_ */ #endif /* NGAP_GNB_UE_CONTEXT_H_ */
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