Commit 3ef79774 authored by root's avatar root

changes-6-may6

parent 6ac9597f
...@@ -100,7 +100,7 @@ int xnap_gNB_generate_xn_setup_request(sctp_assoc_t assoc_id, xnap_setup_req_t * ...@@ -100,7 +100,7 @@ int xnap_gNB_generate_xn_setup_request(sctp_assoc_t assoc_id, xnap_setup_req_t *
// for (int i=0;i<1;i++) // for (int i=0;i<1;i++)
{ {
TAISupport_ItemIEs = (XNAP_TAISupport_Item_t *)calloc(1, sizeof(XNAP_TAISupport_Item_t)); TAISupport_ItemIEs = (XNAP_TAISupport_Item_t *)calloc(1, sizeof(XNAP_TAISupport_Item_t));
INT24_TO_OCTET_STRING(req->tai_support, &TAISupport_ItemIEs->tac); INT24_TO_OCTET_STRING(*req->tai_support, &TAISupport_ItemIEs->tac);
{ {
for (int j = 0; j < 1; j++) { for (int j = 0; j < 1; j++) {
e_BroadcastPLMNinTAISupport_ItemIE = e_BroadcastPLMNinTAISupport_ItemIE =
...@@ -146,7 +146,7 @@ int xnap_gNB_generate_xn_setup_request(sctp_assoc_t assoc_id, xnap_setup_req_t * ...@@ -146,7 +146,7 @@ int xnap_gNB_generate_xn_setup_request(sctp_assoc_t assoc_id, xnap_setup_req_t *
NR_CELL_ID_TO_BIT_STRING(req->gNB_id, NR_CELL_ID_TO_BIT_STRING(req->gNB_id,
&servedCellMember->served_cell_info_NR.cellID.nr_CI); // bit string &servedCellMember->served_cell_info_NR.cellID.nr_CI); // bit string
INT24_TO_OCTET_STRING(req->tai_support, &servedCellMember->served_cell_info_NR.tac); // octet string INT24_TO_OCTET_STRING(*req->tai_support, &servedCellMember->served_cell_info_NR.tac); // octet string
for (int k = 0; k < 1; k++) { for (int k = 0; k < 1; k++) {
plmn = (XNAP_PLMN_Identity_t *)calloc(1, sizeof(XNAP_PLMN_Identity_t)); plmn = (XNAP_PLMN_Identity_t *)calloc(1, sizeof(XNAP_PLMN_Identity_t));
{ {
......
...@@ -93,7 +93,7 @@ int xnap_gNB_handle_xn_setup_request(instance_t instance, sctp_assoc_t assoc_id, ...@@ -93,7 +93,7 @@ int xnap_gNB_handle_xn_setup_request(instance_t instance, sctp_assoc_t assoc_id,
return -1; return -1;
} else { } else {
OCTET_STRING_TO_INT24(&ie->value.choice.TAISupport_List.list.array[0]->tac, req->tai_support); OCTET_STRING_TO_INT24(&ie->value.choice.TAISupport_List.list.array[0]->tac, req->tai_support);
LOG_I(XNAP, "tac %d \n", req->tai_support); LOG_I(XNAP, "tac %d \n", *req->tai_support);
} }
LOG_D(XNAP, "req->gNB id: %lu \n", req->gNB_id); LOG_D(XNAP, "req->gNB id: %lu \n", req->gNB_id);
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#include "queue.h" #include "queue.h"
#include "assertions.h" #include "assertions.h"
#include "conversions.h" #include "conversions.h"
#include "xnap_gNB_generate_messages.h"
#include "gnb_config.h"
RB_PROTOTYPE(xnap_gnb_tree, xnap_gNB_data_t, entry, xnap_gNB_compare_assoc_id); RB_PROTOTYPE(xnap_gnb_tree, xnap_gNB_data_t, entry, xnap_gNB_compare_assoc_id);
...@@ -210,8 +212,8 @@ void *xnap_task(void *arg) ...@@ -210,8 +212,8 @@ void *xnap_task(void *arg)
LOG_D(XNAP, "Starting XNAP layer\n"); LOG_D(XNAP, "Starting XNAP layer\n");
itti_mark_task_ready(TASK_XNAP); itti_mark_task_ready(TASK_XNAP);
const int instance = 0; const int instance = 0;
xnap_net_config_t *xn_net_config = Read_IPconfig_Xn(); xnap_net_config_t xn_net_config = Read_IPconfig_Xn();
createXninst(instance, NULL, xn_net_config); createXninst(instance, NULL, &xn_net_config);
while (1) { while (1) {
itti_receive_msg(TASK_XNAP, &received_msg); itti_receive_msg(TASK_XNAP, &received_msg);
......
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