maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix reject gtp-u incoming with no data

Browse Source
This commit is contained in:
laurent
2022-09-06 13:48:00 +02:00
parent d1a36c29c2
commit b36a5b446f
1 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/ocp-gtpu/gtp_itf.cpp
+9 -32
View File
@@ -1096,44 +1096,21 @@ static int Gtpv1uHandleGpdu(int h,
const rb_id_t rb_id=tunnel->second.incoming_rb_id; const rb_id_t rb_id=tunnel->second.incoming_rb_id;
const mui_t mui=RLC_MUI_UNDEFINED; const mui_t mui=RLC_MUI_UNDEFINED;
const confirm_t confirm=RLC_SDU_CONFIRM_NO; const confirm_t confirm=RLC_SDU_CONFIRM_NO;
const sdu_size_t sdu_buffer_size=msgBufLen-offset; const sdu_size_t sdu_buffer_size = msgBufLen - offset;
if (sdu_buffer_size < 1) {
LOG_E(GTPU, "gtp-u received header is malformed, ignore gtp packet\n");
return GTPNOK;
}
unsigned char *const sdu_buffer=msgBuf+offset; unsigned char *const sdu_buffer=msgBuf+offset;
const pdcp_transmission_mode_t mode=PDCP_TRANSMISSION_MODE_DATA; const pdcp_transmission_mode_t mode=PDCP_TRANSMISSION_MODE_DATA;
const uint32_t sourceL2Id=0; const uint32_t sourceL2Id=0;
const uint32_t destinationL2Id=0; const uint32_t destinationL2Id=0;
pthread_mutex_unlock(&globGtp.gtp_lock); pthread_mutex_unlock(&globGtp.gtp_lock);
if (qfi != -1 && tunnel->second.callBackSDAP) { if (sdu_buffer_size > 0) {
if ( !tunnel->second.callBackSDAP(&ctxt, if (qfi != -1 && tunnel->second.callBackSDAP) {
srb_flag, if (!tunnel->second.callBackSDAP(&ctxt, srb_flag, rb_id, mui, confirm, sdu_buffer_size, sdu_buffer, mode, &sourceL2Id, &destinationL2Id, qfi, rqi, tunnel->second.pdusession_id))
rb_id, LOG_E(GTPU, "[%d] down layer refused incoming packet\n", h);
mui, } else {
confirm, if (!tunnel->second.callBack(&ctxt, srb_flag, rb_id, mui, confirm, sdu_buffer_size, sdu_buffer, mode, &sourceL2Id, &destinationL2Id))
sdu_buffer_size, LOG_E(GTPU, "[%d] down layer refused incoming packet\n", h);
sdu_buffer, }
mode,
&sourceL2Id,
&destinationL2Id,
qfi,
rqi,
tunnel->second.pdusession_id) )
LOG_E(GTPU,"[%d] down layer refused incoming packet\n", h);
} else {
if ( !tunnel->second.callBack(&ctxt,
srb_flag,
rb_id,
mui,
confirm,
sdu_buffer_size,
sdu_buffer,
mode,
&sourceL2Id,
&destinationL2Id) )
LOG_E(GTPU,"[%d] down layer refused incoming packet\n", h);
} }
if(NR_PDCP_PDU_SN > 0 && NR_PDCP_PDU_SN %5 ==0){ if(NR_PDCP_PDU_SN > 0 && NR_PDCP_PDU_SN %5 ==0){