neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/31481 )
Change subject: cosmetic: rename next_seid to next_up_seid ......................................................................
cosmetic: rename next_seid to next_up_seid
There are UP-SEID and CP-SEID. Only UP-SEID are chosen by the UPF. Clarify naming.
Change-Id: Ib725857079400accb4781f8a91eca6495b6b92a9 --- M include/osmocom/upf/up_endpoint.h M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_session.c 3 files changed, 17 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/81/31481/1
diff --git a/include/osmocom/upf/up_endpoint.h b/include/osmocom/upf/up_endpoint.h index 12ab548..58fe01c 100644 --- a/include/osmocom/upf/up_endpoint.h +++ b/include/osmocom/upf/up_endpoint.h @@ -38,10 +38,10 @@ /* list of struct up_peer. */ struct llist_head peers;
- uint64_t next_seid_state; + uint64_t next_up_seid_state; };
struct up_endpoint *up_endpoint_init(void *ctx, const struct osmo_sockaddr *local_addr); void up_endpoint_free(struct up_endpoint **ep);
-uint64_t up_endpoint_next_seid(struct up_endpoint *ep); +uint64_t up_endpoint_next_up_seid(struct up_endpoint *ep); diff --git a/src/osmo-upf/up_endpoint.c b/src/osmo-upf/up_endpoint.c index 4500a43..7a2628a 100644 --- a/src/osmo-upf/up_endpoint.c +++ b/src/osmo-upf/up_endpoint.c @@ -271,11 +271,11 @@ return NULL; }
-uint64_t up_endpoint_next_seid(struct up_endpoint *ep) +uint64_t up_endpoint_next_up_seid(struct up_endpoint *ep) { uint64_t sanity; for (sanity = 2342; sanity; sanity--) { - uint64_t next_seid = osmo_pfcp_next_seid(&ep->next_seid_state); + uint64_t next_seid = osmo_pfcp_next_seid(&ep->next_up_seid_state); if (up_endpoint_find_session(ep, next_seid)) continue; return next_seid; diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index bbf994e..5874f3c 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -986,7 +986,7 @@ static struct up_session *up_session_add(struct up_peer *peer, const struct osmo_pfcp_ie_f_seid *cp_f_seid) { struct up_session *session; - uint64_t up_seid = up_endpoint_next_seid(peer->up_endpoint); + uint64_t up_seid = up_endpoint_next_up_seid(peer->up_endpoint);
if (!up_seid) return NULL;
-
neels