PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix GTP-U bearer address conversion 

Addresses with a leading 0 in hex represenatation were converted
without the leading 0 and padded afterwards with a trailing 0. This
leaded to wrong IPs in the GTP-U bearer setup.
This commit is contained in:
Nils Fürste 2021-10-26 18:37:55 +02:00 committed by Ismael Gomez
parent b036da07de
commit 3b1131936e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
srsenb/src/stack/ngap/ngap_ue_bearer_manager.cc
View File

@ -86,7 +86,7 @@ int ngap_ue_bearer_manager::add_gtpu_bearer(uint16_t
logger.info("Addr in %x", addr_in);
tunnel.address_in.from_number(addr_in);
tunnel.address_in.from_number(addr_in, 32);
tunnel.teid_in = rtn.value();
logger.info("Added GTPU tunnel rnti 0x%04x, pdu_session_id=%d, teid_out %d, teid_in %d, address out 0x%x, "

7
srsenb/src/stack/upper/gtpu.cc
View File

@ -510,11 +510,12 @@ srsran::expected<uint32_t> gtpu::add_bearer(uint16_t rnti,
}
// Return bind address for S1AP and NGAP setup
struct in_addr inaddr;
if ((inet_pton(AF_INET, gtp_bind_addr.c_str(), &inaddr)) < 1) {
uint8_t addr_in_tmp[4];
if ((inet_pton(AF_INET, gtp_bind_addr.c_str(), &addr_in_tmp)) < 1) {
logger.error("Invalid address or failure during conversion: %s\n", gtp_bind_addr.c_str());
}
addr_in = ntohl(inaddr.s_addr);
addr_in = 0;
addr_in = addr_in_tmp[3] | (addr_in_tmp[2] << 8) | (addr_in_tmp[1] << 16) | (addr_in_tmp[0] << 24);
return teid_in;
}