Commit b2d088b3 authored by Fang-WANG's avatar Fang-WANG

test ping ok with oai ue and cost ue

parent 763f0341
...@@ -459,6 +459,8 @@ static void deliver_sdu_drb(void *_ue, nr_pdcp_entity_t *entity, ...@@ -459,6 +459,8 @@ static void deliver_sdu_drb(void *_ue, nr_pdcp_entity_t *entity,
int rb_id; int rb_id;
int i; int i;
log_dump(PDCP, buf, 40 , LOG_DUMP_CHAR," deliver_sdu_drb Received bytes:\n" );
if(UE_NAS_USE_TUN){ if(UE_NAS_USE_TUN){
LOG_D(PDCP, "IP packet received, to be sent to UE TUN interface"); LOG_D(PDCP, "IP packet received, to be sent to UE TUN interface");
len = write(nas_sock_fd[0], buf, size); len = write(nas_sock_fd[0], buf, size);
...@@ -475,7 +477,7 @@ static void deliver_sdu_drb(void *_ue, nr_pdcp_entity_t *entity, ...@@ -475,7 +477,7 @@ static void deliver_sdu_drb(void *_ue, nr_pdcp_entity_t *entity,
} }
LOG_E(PDCP, "%s:%d:%s: fatal, no RB found for ue %d\n", LOG_E(PDCP, "%s:%d:%s: fatal, no RB found for ue %d\n",
__FILE__, __LINE__, __FUNCTION__, ue->rnti); __FILE__, __LINE__, __FUNCTION__, ue->rnti);
exit(1); exit(1);
rb_found: rb_found:
...@@ -495,7 +497,7 @@ static void deliver_sdu_drb(void *_ue, nr_pdcp_entity_t *entity, ...@@ -495,7 +497,7 @@ static void deliver_sdu_drb(void *_ue, nr_pdcp_entity_t *entity,
GTPV1U_GNB_TUNNEL_DATA_REQ(message_p).rnti = ue->rnti; GTPV1U_GNB_TUNNEL_DATA_REQ(message_p).rnti = ue->rnti;
GTPV1U_GNB_TUNNEL_DATA_REQ(message_p).pdusession_id = entity->pdusession_id; GTPV1U_GNB_TUNNEL_DATA_REQ(message_p).pdusession_id = entity->pdusession_id;
if (offset==1) LOG_I(PDCP, "%s() (drb %d) SDAP header %2x\n",__func__, rb_id, buf[0]); if (offset==1) LOG_I(PDCP, "%s() (drb %d) SDAP header %2x\n",__func__, rb_id, buf[0]);
LOG_D(PDCP, "%s() (drb %d) sending message to gtp size %d\n", __func__, rb_id, size-offset); LOG_I(PDCP, "%s() (drb %d) sending message to gtp size %d\n", __func__, rb_id, size-offset);
itti_send_msg_to_task(TASK_VARIABLE, INSTANCE_DEFAULT, message_p); itti_send_msg_to_task(TASK_VARIABLE, INSTANCE_DEFAULT, message_p);
} }
} }
...@@ -536,7 +538,7 @@ rb_found: ...@@ -536,7 +538,7 @@ rb_found:
memblock = get_free_mem_block(size, __FUNCTION__); memblock = get_free_mem_block(size, __FUNCTION__);
memcpy(memblock->data, buf, size); memcpy(memblock->data, buf, size);
LOG_I(PDCP, "%s(): (srb %d) calling rlc_data_req size %d\n", __func__, rb_id, size); LOG_I(PDCP, "%s(): (drb %d) calling rlc_data_req size %d\n", __func__, rb_id, size);
//for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)memblock->data[i]); //for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)memblock->data[i]);
//printf("\n"); //printf("\n");
enqueue_rlc_data_req(&ctxt, 0, MBMS_FLAG_NO, rb_id, sdu_id, 0, size, memblock, NULL, NULL); enqueue_rlc_data_req(&ctxt, 0, MBMS_FLAG_NO, rb_id, sdu_id, 0, size, memblock, NULL, NULL);
...@@ -1198,10 +1200,13 @@ static boolean_t pdcp_data_req_drb( ...@@ -1198,10 +1200,13 @@ static boolean_t pdcp_data_req_drb(
ue = nr_pdcp_manager_get_ue(nr_pdcp_ue_manager, rnti); ue = nr_pdcp_manager_get_ue(nr_pdcp_ue_manager, rnti);
if (rb_id < 1 || rb_id > 5) // if (rb_id < 1 || rb_id > 5)
rb = NULL; // rb = NULL;
else // else
rb = ue->drb[rb_id - 1]; rb = ue->drb[0];
LOG_I(PDCP, "%s:%d:%s: (rnti %d, rb_id %ld)\n",
__FILE__, __LINE__, __FUNCTION__, rnti, rb_id);
if (rb == NULL) { if (rb == NULL) {
LOG_E(PDCP, "%s:%d:%s: no DRB found (rnti %d, rb_id %ld)\n", LOG_E(PDCP, "%s:%d:%s: no DRB found (rnti %d, rb_id %ld)\n",
......
...@@ -12,20 +12,20 @@ gNBs = ...@@ -12,20 +12,20 @@ gNBs =
gNB_name = "gNB-Eurecom-5GNRBox"; gNB_name = "gNB-Eurecom-5GNRBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values // Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1; tracking_area_code = 100;
plmn_list = ({ plmn_list = ({
mcc = 208; mcc = 460;
mnc = 99; mnc = 11;
mnc_length = 2; mnc_length = 2;
snssaiList = ( snssaiList = (
{ {
sst = 1; sst = 1;
sd = 0x010203; // 0 false, else true #sd = 0x010203; // 0 false, else true
},
{
sst = 1;
sd = 0x112233; // 0 false, else true
} }
#{
#st = 1;
# sd = 0x112233; // 0 false, else true
#
); );
}); });
...@@ -223,7 +223,7 @@ gNBs = ...@@ -223,7 +223,7 @@ gNBs =
////////// MME parameters: ////////// MME parameters:
amf_ip_address = ( { ipv4 = "192.168.69.131"; amf_ip_address = ( { ipv4 = "192.168.199.211";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -245,12 +245,12 @@ gNBs = ...@@ -245,12 +245,12 @@ gNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
GNB_INTERFACE_NAME_FOR_NG_AMF = "eth0"; GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1";
GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.18.198/24"; GNB_IPV4_ADDRESS_FOR_NG_AMF = "192.168.199.224/24";
GNB_INTERFACE_NAME_FOR_NGU = "eth0"; GNB_INTERFACE_NAME_FOR_NGU = "eno1";
GNB_IPV4_ADDRESS_FOR_NGU = "192.168.18.198/24"; GNB_IPV4_ADDRESS_FOR_NGU = "192.168.199.224/24";
GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_PORT_FOR_S1U = 2152; # Spec 2152
GNB_IPV4_ADDRESS_FOR_X2C = "192.168.18.198/24"; GNB_IPV4_ADDRESS_FOR_X2C = "192.168.199.224/24";
GNB_PORT_FOR_X2C = 36422; # Spec 36422 GNB_PORT_FOR_X2C = 36422; # Spec 36422
}; };
...@@ -282,7 +282,7 @@ RUs = ( ...@@ -282,7 +282,7 @@ RUs = (
att_rx = 0; att_rx = 0;
bands = [7]; bands = [7];
max_pdschReferenceSignalPower = -27; max_pdschReferenceSignalPower = -27;
max_rxgain = 114; max_rxgain = 120;
eNB_instances = [0]; eNB_instances = [0];
#beamforming 1x4 matrix: #beamforming 1x4 matrix:
bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000]; bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
......
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