Commit 599464bc authored by Lionel Gauthier's avatar Lionel Gauthier

sync ENB source code (debug session on PDCP GTP)

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5961 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent eec53f12
...@@ -408,6 +408,7 @@ boolean_t pdcp_data_ind( ...@@ -408,6 +408,7 @@ boolean_t pdcp_data_ind(
pdcp_sn_t sequence_number = 0; pdcp_sn_t sequence_number = 0;
uint8_t payload_offset = 0; uint8_t payload_offset = 0;
rb_id_t rb_id = rb_idP; rb_id_t rb_id = rb_idP;
boolean_t packet_forwarded = FALSE;
...@@ -672,6 +673,32 @@ boolean_t pdcp_data_ind( ...@@ -672,6 +673,32 @@ boolean_t pdcp_data_ind(
return TRUE; return TRUE;
} }
#endif #endif
// XXX Decompression would be done at this point
/*
* After checking incoming sequence number PDCP header
* has to be stripped off so here we copy SDU buffer starting
* from its second byte (skipping 0th and 1st octets, i.e.
* PDCP header)
*/
#if defined(LINK_PDCP_TO_GTPV1U)
if (enb_flagP) {
LOG_I(PDCP,"Sending to GTPV1U %d bytes\n", sdu_buffer_sizeP - payload_offset);
gtpv1u_new_data_req(
enb_mod_idP, //gtpv1u_data_t *gtpv1u_data_p,
ue_mod_idP,//rb_id/maxDRB, TO DO UE ID
((pdcp_data_ind_header_t *) new_sdu_p->data)->rb_id,
&sdu_buffer_pP->data[payload_offset],
sdu_buffer_sizeP - payload_offset);
packet_forwarded = TRUE;
}
#else
packet_forwarded = FALSE;
#endif
if (FALSE == packet_forwarded) {
new_sdu_p = get_free_mem_block(sdu_buffer_sizeP - payload_offset + sizeof (pdcp_data_ind_header_t)); new_sdu_p = get_free_mem_block(sdu_buffer_sizeP - payload_offset + sizeof (pdcp_data_ind_header_t));
if (new_sdu_p) { if (new_sdu_p) {
...@@ -698,15 +725,6 @@ boolean_t pdcp_data_ind( ...@@ -698,15 +725,6 @@ boolean_t pdcp_data_ind(
#endif #endif
} }
// XXX Decompression would be done at this point
/*
* After checking incoming sequence number PDCP header
* has to be stripped off so here we copy SDU buffer starting
* from its second byte (skipping 0th and 1st octets, i.e.
* PDCP header)
*/
memcpy(&new_sdu_p->data[sizeof (pdcp_data_ind_header_t)], \ memcpy(&new_sdu_p->data[sizeof (pdcp_data_ind_header_t)], \
&sdu_buffer_pP->data[payload_offset], \ &sdu_buffer_pP->data[payload_offset], \
sdu_buffer_sizeP - payload_offset); sdu_buffer_sizeP - payload_offset);
...@@ -732,15 +750,17 @@ boolean_t pdcp_data_ind( ...@@ -732,15 +750,17 @@ boolean_t pdcp_data_ind(
Pdcp_stats_rx_bytes[module_id][(rb_idP & RAB_OFFSET2) >> RAB_SHIFT2][(rb_idP & RAB_OFFSET) - DTCH] += sdu_buffer_sizeP; Pdcp_stats_rx_bytes[module_id][(rb_idP & RAB_OFFSET2) >> RAB_SHIFT2][(rb_idP & RAB_OFFSET) - DTCH] += sdu_buffer_sizeP;
}*/ }*/
} }
}
#if defined(STOP_ON_IP_TRAFFIC_OVERLOAD) #if defined(STOP_ON_IP_TRAFFIC_OVERLOAD)
else { else {
AssertFatal(0, "[FRAME %5u][%s][PDCP][MOD %u/%u][RB %u] PDCP_DATA_IND SDU DROPPED, OUT OF MEMORY \n", AssertFatal(0, "[FRAME %5u][%s][PDCP][MOD %u/%u][RB %u] PDCP_DATA_IND SDU DROPPED, OUT OF MEMORY \n",
frameP, frameP,
(enb_flagP) ? "eNB" : "UE", (enb_flagP) ? "eNB" : "UE",
enb_mod_idP, enb_mod_idP,
ue_mod_idP, ue_mod_idP,
rb_id); rb_id);
} }
#endif
#endif #endif
free_mem_block(sdu_buffer_pP); free_mem_block(sdu_buffer_pP);
......
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