Skip to content

O
OpenXG-RAN
Commit e6acfaca authored by Chenyu's avatar Chenyu
Browse files
Options

gnb(nos1) and ue(nos1) is ok,ue read tun send to gnb by rfsim and gnb write... 

 gnb(nos1) and ue(nos1) is ok,ue read tun send to gnb by rfsim and gnb write that data to oaitun_enb1(ifconfig can descover RX packet rise); gnb(s1) and ue(nos1) can send initialuemessage to amf
parent 54343c4f
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 20 deletions
executables/nr-softmodem.c
View file @ e6acfaca
......@@ -418,8 +418,9 @@ int create_gNB_tasks(uint32_t gnb_nb) {
}
// if (AMF_MODE_ENABLED && (get_softmodem_params()->phy_test==0 && get_softmodem_params()->do_ra==0)) {
//if (AMF_MODE_ENABLED && (get_softmodem_params()->phy_test==0 && get_softmodem_params()->do_ra==0))
if (AMF_MODE_ENABLED && get_softmodem_params()->phy_test==0 )
{
if (gnb_nb > 0) {
/*
if (itti_create_task (TASK_SCTP, sctp_eNB_task, NULL) < 0) {
......@@ -449,7 +450,7 @@ int create_gNB_tasks(uint32_t gnb_nb) {
return -1;
}
}
//}
}
if (gnb_nb > 0) {
......
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
View file @ e6acfaca
......@@ -465,7 +465,7 @@ static void deliver_sdu_drb(protocol_ctxt_t *ctxt_pP,void *_ue, nr_pdcp_entity_t
int rb_id;
int i;
if (1) { //(IS_SOFTMODEM_NOS1){
if (IS_SOFTMODEM_NOS1 || ctxt_pP->enb_flag==ENB_FLAG_NO){
#if 0
log_dump(PDCP,buf,size,LOG_DUMP_CHAR," PDCP Received SDU:\n");
if (size > 4700)
......@@ -517,6 +517,7 @@ static void deliver_sdu_drb(protocol_ctxt_t *ctxt_pP,void *_ue, nr_pdcp_entity_t
}
#else
printf("----------------%d send data to tun -----------------\n",ctxt_pP->enb_flag);
len = write(nas_sock_fd[0], buf, size);
if (len != size) {
LOG_E(PDCP, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
......@@ -536,22 +537,22 @@ static void deliver_sdu_drb(protocol_ctxt_t *ctxt_pP,void *_ue, nr_pdcp_entity_t
__FILE__, __LINE__, __FUNCTION__, ue->rnti);
exit(1);
// rb_found:
// gtpu_buffer_p = itti_malloc(TASK_PDCP_ENB, TASK_GTPV1_U,
// size + GTPU_HEADER_OVERHEAD_MAX);
// AssertFatal(gtpu_buffer_p != NULL, "OUT OF MEMORY");
// memcpy(&gtpu_buffer_p[GTPU_HEADER_OVERHEAD_MAX], buf, size);
// message_p = itti_alloc_new_message(TASK_PDCP_ENB, GTPV1U_ENB_TUNNEL_DATA_REQ);
// AssertFatal(message_p != NULL, "OUT OF MEMORY");
// GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).buffer = gtpu_buffer_p;
// GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).length = size;
// GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).offset = GTPU_HEADER_OVERHEAD_MAX;
// GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).rnti = ue->rnti;
// GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).rab_id = rb_id + 4;
// LOG_D(PDCP, "%s() (drb %d) sending message to gtp size %d\n", __func__, rb_id, size);
// //for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)buf[i]);
// //printf("\n");
// itti_send_msg_to_task(TASK_GTPV1_U, INSTANCE_DEFAULT, message_p);
rb_found:
gtpu_buffer_p = itti_malloc(TASK_PDCP_ENB, TASK_GTPV1_U,
size + GTPU_HEADER_OVERHEAD_MAX);
AssertFatal(gtpu_buffer_p != NULL, "OUT OF MEMORY");
memcpy(&gtpu_buffer_p[GTPU_HEADER_OVERHEAD_MAX], buf, size);
message_p = itti_alloc_new_message(TASK_PDCP_ENB, GTPV1U_ENB_TUNNEL_DATA_REQ);
AssertFatal(message_p != NULL, "OUT OF MEMORY");
GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).buffer = gtpu_buffer_p;
GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).length = size;
GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).offset = GTPU_HEADER_OVERHEAD_MAX;
GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).rnti = ue->rnti;
GTPV1U_ENB_TUNNEL_DATA_REQ(message_p).rab_id = rb_id + 4;
LOG_D(PDCP, "%s() (drb %d) sending message to gtp size %d\n", __func__, rb_id, size);
for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)buf[i]);
printf("\n");
itti_send_msg_to_task(TASK_GTPV1_U, INSTANCE_DEFAULT, message_p);
}
}
......
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