5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass pdu_session_id instead of lcid for mapping in GTPU

Browse Source
master
Bedran Karakoc 3 years ago committed by Bedran Karakoc
parent 850606f20b
commit ca08b18745
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File

1
srsenb/hdr/stack/ngap/ngap_ue_bearer_manager.h
Unescape Escape View File

@ -63,7 +63,6 @@ private:
srslog::basic_logger& logger; srslog::basic_logger& logger;
int add_gtpu_bearer(uint16_t rnti, int add_gtpu_bearer(uint16_t rnti,
uint32_t lcid,
uint32_t pdu_session_id, uint32_t pdu_session_id,
uint32_t teid_out, uint32_t teid_out,
asn1::bounded_bitstring<1, 160, true, true> address, asn1::bounded_bitstring<1, 160, true, true> address,

10
srsenb/src/stack/ngap/ngap_ue_bearer_manager.cc
Unescape Escape View File

@ -30,9 +30,6 @@ int ngap_ue_bearer_manager::add_pdu_session(uint16_t
uint32_t& teid_in, uint32_t& teid_in,
asn1::ngap_nr::cause_c& cause) asn1::ngap_nr::cause_c& cause)
{ {
// RRC call for QoS parameter and lcid <-> ID mapping
lcid = rrc->allocate_lcid(rnti);
// Only add session if gtpu was successful // Only add session if gtpu was successful
pdu_session_t::gtpu_tunnel tunnel; pdu_session_t::gtpu_tunnel tunnel;
@ -43,7 +40,7 @@ int ngap_ue_bearer_manager::add_pdu_session(uint16_t
} }
// TODO: remove lcid and just use pdu_session_id and rnti as id for GTP tunnel // TODO: remove lcid and just use pdu_session_id and rnti as id for GTP tunnel
int rtn = add_gtpu_bearer(rnti, lcid, pdu_session_id, teid_out, addr_out, tunnel); int rtn = add_gtpu_bearer(rnti, pdu_session_id, teid_out, addr_out, tunnel);
if (rtn != SRSRAN_SUCCESS) { if (rtn != SRSRAN_SUCCESS) {
logger.error("Adding PDU Session ID=%d to GTPU", pdu_session_id); logger.error("Adding PDU Session ID=%d to GTPU", pdu_session_id);
return SRSRAN_ERROR; return SRSRAN_ERROR;
@ -71,7 +68,6 @@ int ngap_ue_bearer_manager::reset_pdu_sessions(uint16_t rnti)
} }
int ngap_ue_bearer_manager::add_gtpu_bearer(uint16_t rnti, int ngap_ue_bearer_manager::add_gtpu_bearer(uint16_t rnti,
uint32_t lcid,
uint32_t pdu_session_id, uint32_t pdu_session_id,
uint32_t teid_out, uint32_t teid_out,
asn1::bounded_bitstring<1, 160, true, true> address_out, asn1::bounded_bitstring<1, 160, true, true> address_out,
@ -80,7 +76,8 @@ int ngap_ue_bearer_manager::add_gtpu_bearer(uint16_t
{ {
// Initialize ERAB tunnel in GTPU right-away. DRBs are only created during RRC setup/reconf // Initialize ERAB tunnel in GTPU right-away. DRBs are only created during RRC setup/reconf
uint32_t addr_in; uint32_t addr_in;
srsran::expected<uint32_t> rtn = gtpu->add_bearer(rnti, lcid, address_out.to_number(), teid_out, addr_in, props); srsran::expected<uint32_t> rtn =
gtpu->add_bearer(rnti, pdu_session_id, address_out.to_number(), teid_out, addr_in, props);
if (rtn.is_error()) { if (rtn.is_error()) {
logger.error("Failed adding pdu_session_id=%d to GTPU", pdu_session_id); logger.error("Failed adding pdu_session_id=%d to GTPU", pdu_session_id);
return SRSRAN_ERROR; return SRSRAN_ERROR;
@ -97,7 +94,6 @@ int ngap_ue_bearer_manager::add_gtpu_bearer(uint16_t
logger.info("Added GTPU tunnel rnti 0x%04x, lcid %d, pdu_session_id=%d, teid_out %d, teid_in %d, address out 0x%x, " logger.info("Added GTPU tunnel rnti 0x%04x, lcid %d, pdu_session_id=%d, teid_out %d, teid_in %d, address out 0x%x, "
"address in 0x%x", "address in 0x%x",
rnti, rnti,
lcid,
pdu_session_id, pdu_session_id,
tunnel.teid_out, tunnel.teid_out,
tunnel.teid_in, tunnel.teid_in,

Write Preview
Loading…
Cancel
Save