pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38623?usp=email )
Change subject: hnbgw: Avoid using struct osmo_pfcp_cp_peer fields directly ......................................................................
hnbgw: Avoid using struct osmo_pfcp_cp_peer fields directly
Use new APIs available in libosmo-pfcp, since those fields will become private.
Depends: libosmo-pfcp.git Change-Id Ic8a5d5ec4237aa8520d426252c924c9617d1d08a Change-Id: I2f587cfb7fd556bcfc43bf70fc93bc79a3c211ca --- M TODO-RELEASE M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/ps_rab_fsm.c 3 files changed, 3 insertions(+), 3 deletions(-)
Approvals: pespin: Verified osmith: Looks good to me, approved
diff --git a/TODO-RELEASE b/TODO-RELEASE index 7b0f29e..86d4f2c 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,4 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmo-sigtran >2.0.0 use API osmo_sua_sccp_cause_name() -libosmo-pfcp >0.4.0 use API osmo_pfcp_cp_peer_set_associated_cb() \ No newline at end of file +libosmo-pfcp >0.4.0 use API osmo_pfcp_cp_peer_set_associated_cb(), osmo_pfcp_cp_peer_get_remote_addr(), osmo_pfcp_cp_peer_next_seid() diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index b79dc39..b39768d 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -241,7 +241,7 @@ if (hnb_gw_is_gtp_mapping_enabled()) { LOGP(DMAIN, LOGL_DEBUG, "RAB Assignment: setting up GTP tunnel mapping via UPF %s\n", - osmo_sockaddr_to_str_c(OTC_SELECT, &g_hnbgw->pfcp.cp_peer->remote_addr)); + osmo_sockaddr_to_str_c(OTC_SELECT, osmo_pfcp_cp_peer_get_remote_addr(g_hnbgw->pfcp.cp_peer))); return hnbgw_gtpmap_rx_rab_ass_req(map, ranap_msg, message); } /* If no UPF is configured, directly forward the message as-is (no GTP mapping). */ diff --git a/src/osmo-hnbgw/ps_rab_fsm.c b/src/osmo-hnbgw/ps_rab_fsm.c index 8905540..f6d113d 100644 --- a/src/osmo-hnbgw/ps_rab_fsm.c +++ b/src/osmo-hnbgw/ps_rab_fsm.c @@ -320,7 +320,7 @@ m->h.seid = 0;
/* Make a new CP-SEID, our local reference for the PFCP session. */ - rab->cp_seid = osmo_pfcp_next_seid(&g_hnbgw->pfcp.cp_peer->next_seid_state); + rab->cp_seid = osmo_pfcp_cp_peer_next_seid(g_hnbgw->pfcp.cp_peer); cp_f_seid = (struct osmo_pfcp_ie_f_seid){ .seid = rab->cp_seid, };