Commit dfde5dc3 authored by root's avatar root

changes 3- 2 may

parent 8d1f9259
......@@ -155,6 +155,7 @@ extern "C" {
COMP_DEF(USIM, log) \
COMP_DEF(F1U, ) \
COMP_DEF(X2AP, ) \
COMP_DEF(XNAP, ) \
COMP_DEF(M2AP, ) \
COMP_DEF(M3AP, ) \
COMP_DEF(NGAP, ) \
......
......@@ -1240,6 +1240,27 @@ ID = LEGACY_E1AP_ERROR
GROUP = ALL:LEGACY_E1AP:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
ID = LEGACY_XNAP_TRACE
DESC = XNAP TRACE LEVEL
GROUP = ALL:LEGACY_XNAP:LEGACY_GROUP_TRACE:LEGACY
FORMAT = string,log
ID = LEGACY_XNAP_DEBUG
DESC = XNAP DEBUG LEVEL
GROUP = ALL:LEGACY_XNAP:LEGACY_GROUP_DEBUG:LEGACY
FORMAT = string,log
ID = LEGACY_XNAP_INFO
DESC = XNAP INFO LEVEL
GROUP = ALL:LEGACY_XNAP:LEGACY_GROUP_INFO:LEGACY
FORMAT = string,log
ID = LEGACY_XNAP_WARNING
DESC = XNAP WARNING LEVEL
GROUP = ALL:LEGACY_XNAP:LEGACY_GROUP_WARNING:LEGACY
FORMAT = string,log
ID = LEGACY_XNAP_ERROR
DESC = XNAP ERROR LEVEL
GROUP = ALL:LEGACY_XNAP:LEGACY_GROUP_ERROR:LEGACY
FORMAT = string,log
#################
#### UE LOGS ####
#################
......
......@@ -9,6 +9,7 @@
#endif
#include "openair2/COMMON/s1ap_messages_def.h"
#include "openair2/COMMON/x2ap_messages_def.h"
#include "openair2/COMMON/xnap_messages_def.h"
#include "openair2/COMMON/m2ap_messages_def.h"
#include "openair2/COMMON/m3ap_messages_def.h"
#include "openair2/COMMON/sctp_messages_def.h"
......
......@@ -81,6 +81,7 @@ typedef struct IttiMsgText_s {
#include <openair2/RRC/LTE/rrc_types.h>
#include <openair2/COMMON/rrc_messages_types.h>
#include <openair2/COMMON/e1ap_messages_types.h>
#include <openair2/COMMON/xnap_messages_types.h>
#include <openair3/NAS/COMMON/UTIL/OctetString.h>
#include <openair3/NAS/COMMON/IES/AccessPointName.h>
......@@ -298,6 +299,7 @@ typedef struct {
TASK_DEF(TASK_S1AP, 200) \
TASK_DEF(TASK_NGAP, 200) \
TASK_DEF(TASK_X2AP, 200) \
TASK_DEF(TASK_XNAP, 200) \
TASK_DEF(TASK_M2AP_ENB, 200) \
TASK_DEF(TASK_M2AP_MCE, 200) \
TASK_DEF(TASK_M3AP, 200) \
......
......@@ -25,6 +25,8 @@
* \version 1.0
*/
#include "openair2/COMMON/xnap_messages_types.h"
/* gNB application layer -> XNAP messages */
MESSAGE_DEF(XNAP_REGISTER_GNB_REQ, MESSAGE_PRIORITY_MED, xnap_register_gnb_req_t, xnap_register_gnb_req)
/* XNAP -> gNB application layer messages */
......
......@@ -118,7 +118,7 @@ static void cu_task_send_sctp_init_req(instance_t instance, char *my_addr) {
itti_send_msg_to_task(TASK_SCTP, instance, message_p);
}
void cu_register_xn(uint32_t gnb_id_num,*cell)
void cu_register_xn(uint32_t gnb_id_num,f1ap_served_cell_info_t *cell)
{
MessageDef *msg;
......@@ -127,20 +127,20 @@ void cu_register_xn(uint32_t gnb_id_num,*cell)
LOG_I(XNAP, "GNB_ID: %d \n", gnb_id);
uint64_t id;
char *name = NULL;
xnap_register_gnb_req_t *req = &XNAP_REGISTER_GNB_REQ(message_p);
req->setup_req.info->tac = cell->tac;
req->setup_req.info->plmn = cell->plmn;
req->setup_req.info->nr_cellid = cell->nr_cellid;
req->setup_req.info->nr_pci = cell->nr_pci;
xnap_register_gnb_req_t *req = &XNAP_REGISTER_GNB_REQ(msg);
req->setup_req.info.tac = cell->tac;
req->setup_req.info.plmn = cell->plmn;
req->setup_req.info.nr_cellid = cell->nr_cellid;
req->setup_req.info.nr_pci = cell->nr_pci;
if (cell->mode == F1AP_MODE_TDD) {
req->setup_req.info->mode = XNAP_MODE_TDD;
req->setup_req.info.mode = XNAP_MODE_TDD;
req->setup_req.info.tdd = cell->tdd;
/*tdd->freqinfo.arfcn = frequencyInfoDL->absoluteFrequencyPointA;
tdd->tbw.scs = frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->subcarrierSpacing;
tdd->tbw.nrb = frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->carrierBandwidth;
tdd->freqinfo.band = *frequencyInfoDL->frequencyBandList.list.array[0];*/
} else {
req->setup_req.info->mode = XNAP_MODE_FDD;
req->setup_req.info.mode = XNAP_MODE_FDD;
req->setup_req.info.fdd = cell->fdd;
/*fdd->dl_freqinfo.arfcn = frequencyInfoDL->absoluteFrequencyPointA;
fdd->ul_freqinfo.arfcn = *scc->uplinkConfigCommon->frequencyInfoUL->absoluteFrequencyPointA;
......@@ -151,7 +151,7 @@ void cu_register_xn(uint32_t gnb_id_num,*cell)
fdd->dl_freqinfo.band = *frequencyInfoDL->frequencyBandList.list.array[0];
fdd->ul_freqinfo.band = *scc->uplinkConfigCommon->frequencyInfoUL->frequencyBandList->list.array[0];*/
}
req->setup_req.info->measurement_timing_information = cell->measurement_timing_information;
req->setup_req.info.measurement_timing_information = cell->measurement_timing_information;
gNB_RRC_INST *rrc = RC.nrrrc[0];
req->setup_req.gNB_id = rrc->node_id;
req->setup_req.tai_support = cell->tac;
......
This diff is collapsed.
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
/*! \file xnap_gNB_generate_messages.h
* \brief xnap procedures for gNB
* \date 2023 July
* \version 1.0
*/
#ifndef XNAP_GNB_GENERATE_MESSAGES_H_
#define XNAP_GNB_GENERATE_MESSAGES_H_
#include "xnap_gNB_defs.h"
#include "xnap_common.h"
int xnap_gNB_generate_xn_setup_request(sctp_assoc_t assoc_id, xnap_setup_req_t *req);
int xnap_gNB_generate_xn_setup_response(sctp_assoc_t assoc_id, xnap_setup_resp_t *resp);
int xnap_gNB_generate_xn_setup_failure(sctp_assoc_t assoc_id, xnap_setup_failure_t *fail);
int xnap_gNB_set_cause(XNAP_Cause_t *cause_p, XNAP_Cause_PR cause_type, long cause_value);
#endif /* XNAP_GNB_GENERATE_MESSAGES_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