July 2022 - gerrit-log - lists.osmocom.org

Change in libosmo-pfcp[master]: apply code review: refactor pfcp_endpoint API

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28754 ) Change subject: apply code review: refactor pfcp_endpoint API ...................................................................... apply code review: refactor pfcp_endpoint API Code review requested that the API should use functions instead of direct access to a struct. I have moved all user provided config to a separate struct osmo_pfcp_endpoint_cfg, to be passed to osmo_pfcp_endpoint_create(). Halfway through those changes, I am not so certain whether that is what reviewers had in mind. It makes sense from the point of view to keep nr of arguments passed to osmo_pfcp_endpoint_create() small, and to allow changing the user provided config without requiring a new osmo_pfcp_endpoint_create2() API function. Though that again has ABI compat problems, and makes no sense from the point of view that all access should be done via API functions. Personally I don't really agree with this change, which is probably the reason why this patch ended up this way. Related: SYS#5599 Change-Id: If80c35c6a942bf9593781b5a6bc28ba37323ce5e --- M include/osmocom/pfcp/pfcp_endpoint.h M src/libosmo-pfcp/pfcp_cp_peer.c M src/libosmo-pfcp/pfcp_endpoint.c 3 files changed, 106 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/54/28754/1 diff --git a/include/osmocom/pfcp/pfcp_endpoint.h b/include/osmocom/pfcp/pfcp_endpoint.h index acc878e..817cd0f 100644 --- a/include/osmocom/pfcp/pfcp_endpoint.h +++ b/include/osmocom/pfcp/pfcp_endpoint.h @@ -32,13 +32,15 @@ struct osmo_pfcp_endpoint; struct osmo_fsm_inst; -#define OSMO_PFCP_TIMER_HEARTBEAT_REQ -19 -#define OSMO_PFCP_TIMER_HEARTBEAT_RESP -20 -#define OSMO_PFCP_TIMER_GRACEFUL_REL -21 -#define OSMO_PFCP_TIMER_T1 -22 -#define OSMO_PFCP_TIMER_N1 -23 -#define OSMO_PFCP_TIMER_KEEP_RESP -24 -#define OSMO_PFCP_TIMER_ASSOC_RETRY -26 +enum osmo_pfcp_timers { + OSMO_PFCP_TIMER_HEARTBEAT_REQ = -19, + OSMO_PFCP_TIMER_HEARTBEAT_RESP = -20, + OSMO_PFCP_TIMER_GRACEFUL_REL = -21, + OSMO_PFCP_TIMER_T1 = -22, + OSMO_PFCP_TIMER_N1 = -23, + OSMO_PFCP_TIMER_KEEP_RESP = -24, + OSMO_PFCP_TIMER_ASSOC_RETRY = -26, +}; extern struct osmo_tdef osmo_pfcp_tdefs[]; @@ -51,51 +53,37 @@ struct osmo_pfcp_msg *req); /* Send/receive PFCP messages to/from remote PFCP endpoints. */ -struct osmo_pfcp_endpoint { - struct { - /* Local address */ - struct osmo_sockaddr local_addr; - /* Local PFCP Node ID, as sent in outgoing messages' Node ID IE */ - struct osmo_pfcp_ie_node_id local_node_id; +struct osmo_pfcp_endpoint; - /* Timer definitions to use, if any. See t1_ms, keep_resp_ms. Use osmo_pfcp_tdefs by default. It is - * convenient to add osmo_pfcp_tdefs as one of your program's osmo_tdef_group entries and call - * osmo_tdef_vty_init() to expose PFCP timers on the VTY. */ - const struct osmo_tdef *tdefs; - } cfg; +struct osmo_pfcp_endpoint_cfg { + /* Local address */ + struct osmo_sockaddr local_addr; + /* Local PFCP Node ID, as sent in outgoing messages' Node ID IE */ + struct osmo_pfcp_ie_node_id local_node_id; - /* PFCP socket */ - struct osmo_fd pfcp_fd; + /* If non-NULL, this function is called just after decoding and before handling the osmo_pfcp_msg passed as + * argument m. + * The caller (you) usually implements this to set m->ctx.peer_fi and m->ctx.session_fi as appropriate, + * so that these are used for logging context during message handling. The caller may also use m->ctx.peer_fi + * and m->ctx.session_fi pointers to reduce lookup iterations in e.g. rx_msg(). */ + osmo_pfcp_endpoint_cb set_msg_ctx_cb; - /* The time at which this endpoint last restarted, as seconds since unix epoch. */ - uint32_t recovery_time_stamp; + /* Callback to receive a single incoming PFCP message from a remote peer, already decoded. See also the doc for + * osmo_pfcp_endpoint_cb. */ + osmo_pfcp_endpoint_cb rx_msg_cb; - /* State for determining the next sequence number for transmitting a request message */ - uint32_t seq_nr_state; - - /* This function is called just after decoding and before handling the message. - * This function may set ctx.peer_fi and ctx.session_fi, used for logging context during message decoding. - * The caller may also use these fi pointers to reduce lookup iterations in rx_msg(). - */ - osmo_pfcp_endpoint_cb set_msg_ctx; - - /* Callback to receive single incoming PFCP messages from a remote peer, already decoded. */ - osmo_pfcp_endpoint_cb rx_msg; + /* Custom timer definitions to use, if any. Relevant timers are: OSMO_PFCP_TIMER_N1, OSMO_PFCP_TIMER_T1, + * OSMO_PFCP_TIMER_KEEP_RESP. These are used for the PFCP message retransmission queue. + * If passed NULL, use the timer definitions from the global osmo_pfcp_tdefs. + * To expose retransmission timers on the VTY configuration, it is convenient to add osmo_pfcp_tdefs as one of + * your program's osmo_tdef_group entries and call osmo_tdef_vty_init(). */ + const struct osmo_tdef *tdefs; /* application-private data */ void *priv; - - /* All transmitted PFCP Request messages, list of osmo_pfcp_queue_entry. - * For a transmitted Request message, wait for a matching Response from a remote peer; if none arrives, - * retransmit (see n1 and t1_ms). */ - struct llist_head sent_requests; - /* All transmitted PFCP Response messages, list of osmo_pfcp_queue_entry. - * For a transmitted Response message, keep it in the queue for a fixed amount of time. If the peer retransmits - * the original Request, do not dispatch the Request, but respond with the queued message directly. */ - struct llist_head sent_responses; }; -struct osmo_pfcp_endpoint *osmo_pfcp_endpoint_create(void *ctx, void *priv); +struct osmo_pfcp_endpoint *osmo_pfcp_endpoint_create(void *ctx, const struct osmo_pfcp_endpoint_cfg *cfg); int osmo_pfcp_endpoint_bind(struct osmo_pfcp_endpoint *ep); void osmo_pfcp_endpoint_close(struct osmo_pfcp_endpoint *ep); void osmo_pfcp_endpoint_free(struct osmo_pfcp_endpoint **ep); @@ -105,3 +93,10 @@ int osmo_pfcp_endpoint_tx_heartbeat_req(struct osmo_pfcp_endpoint *ep, const struct osmo_sockaddr *remote_addr); void osmo_pfcp_endpoint_invalidate_ctx(struct osmo_pfcp_endpoint *ep, struct osmo_fsm_inst *deleted_fi); + +const struct osmo_pfcp_endpoint_cfg *osmo_pfcp_endpoint_get_cfg(const struct osmo_pfcp_endpoint *ep); +void *osmo_pfcp_endpoint_get_priv(const struct osmo_pfcp_endpoint *ep); +uint32_t osmo_pfcp_endpoint_get_recovery_timestamp(const struct osmo_pfcp_endpoint *ep); +void osmo_pfcp_endpoint_set_seq_nr_state(struct osmo_pfcp_endpoint *ep, uint32_t seq_nr_state); + +bool osmo_pfcp_endpoint_retrans_queue_is_busy(const struct osmo_pfcp_endpoint *ep); diff --git a/src/libosmo-pfcp/pfcp_cp_peer.c b/src/libosmo-pfcp/pfcp_cp_peer.c index e1dd9ac..959206a 100644 --- a/src/libosmo-pfcp/pfcp_cp_peer.c +++ b/src/libosmo-pfcp/pfcp_cp_peer.c @@ -161,7 +161,7 @@ struct osmo_pfcp_msg *m; m = osmo_pfcp_cp_peer_new_req(cp_peer, OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); - m->ies.assoc_setup_req.recovery_time_stamp = cp_peer->ep->recovery_time_stamp; + m->ies.assoc_setup_req.recovery_time_stamp = osmo_pfcp_endpoint_get_recovery_timestamp(cp_peer->ep); m->ies.assoc_setup_req.cp_function_features_present = true; osmo_pfcp_bits_set(m->ies.assoc_setup_req.cp_function_features.bits, OSMO_PFCP_CP_FEAT_BUNDL, true); diff --git a/src/libosmo-pfcp/pfcp_endpoint.c b/src/libosmo-pfcp/pfcp_endpoint.c index 6162086..3002591 100644 --- a/src/libosmo-pfcp/pfcp_endpoint.c +++ b/src/libosmo-pfcp/pfcp_endpoint.c @@ -32,6 +32,29 @@ #include <osmocom/pfcp/pfcp_endpoint.h> #include <osmocom/pfcp/pfcp_msg.h> +/* Send/receive PFCP messages to/from remote PFCP endpoints. */ +struct osmo_pfcp_endpoint { + struct osmo_pfcp_endpoint_cfg cfg; + + /* PFCP socket */ + struct osmo_fd pfcp_fd; + + /* The time at which this endpoint last restarted, as seconds since unix epoch. */ + uint32_t recovery_time_stamp; + + /* State for determining the next sequence number for transmitting a request message */ + uint32_t seq_nr_state; + + /* All transmitted PFCP Request messages, list of osmo_pfcp_queue_entry. + * For a transmitted Request message, wait for a matching Response from a remote peer; if none arrives, + * retransmit (see n1 and t1_ms). */ + struct llist_head sent_requests; + /* All transmitted PFCP Response messages, list of osmo_pfcp_queue_entry. + * For a transmitted Response message, keep it in the queue for a fixed amount of time. If the peer retransmits + * the original Request, do not dispatch the Request, but respond with the queued message directly. */ + struct llist_head sent_responses; +}; + /*! Entry of pfcp_endpoint message queue of PFCP messages, for re-transsions. */ struct osmo_pfcp_queue_entry { /* entry in per-peer list of messages waiting for a response */ @@ -103,18 +126,22 @@ {} }; -struct osmo_pfcp_endpoint *osmo_pfcp_endpoint_create(void *ctx, void *priv) +/* Allocate a PFCP endpoint. Copy cfg's content to the allocated endpoint struct. Set the recovery_time_stamp to the + * current time. */ +struct osmo_pfcp_endpoint *osmo_pfcp_endpoint_create(void *ctx, const struct osmo_pfcp_endpoint_cfg *cfg) { struct osmo_pfcp_endpoint *ep = talloc_zero(ctx, struct osmo_pfcp_endpoint); uint32_t unix_time; if (!ep) return NULL; + ep->cfg = *cfg; + if (!ep->cfg.tdefs) + ep->cfg.tdefs = osmo_pfcp_tdefs; + INIT_LLIST_HEAD(&ep->sent_requests); INIT_LLIST_HEAD(&ep->sent_responses); - ep->cfg.tdefs = osmo_pfcp_tdefs; - ep->priv = priv; ep->pfcp_fd.fd = -1; /* time() returns seconds since 1970 (UNIX epoch), but the recovery_time_stamp is coded in the NTP format, which is @@ -343,8 +370,8 @@ /* Populate message context to point at peer and session, if applicable. * With that context applied, log message rx. */ - if (ep->set_msg_ctx) - ep->set_msg_ctx(ep, m, NULL); + if (ep->cfg.set_msg_ctx_cb) + ep->cfg.set_msg_ctx_cb(ep, m, NULL); OSMO_LOG_PFCP_MSG(m, LOGL_INFO, "received retransmission of earlier request\n"); /* Also log on the earlier PFCP msg that it is resent */ @@ -362,8 +389,8 @@ /* Populate message context to point at peer and session, if applicable. * With that context applied, log message rx. */ - if (ep->set_msg_ctx) - ep->set_msg_ctx(ep, m, req); + if (ep->cfg.set_msg_ctx_cb) + ep->cfg.set_msg_ctx_cb(ep, m, req); OSMO_LOG_PFCP_MSG(m, LOGL_INFO, "received\n"); if (req && req->ctx.resp_cb) { @@ -373,12 +400,12 @@ if (rc != 1) { dispatch_rx = false; OSMO_LOG_PFCP_MSG(m, LOGL_DEBUG, - "response handled by m->resp_cb(), not dispatching to rx_msg()\n"); + "response handled by m->resp_cb(), not dispatching to rx_msg_cb()\n"); } } if (dispatch_rx) - ep->rx_msg(ep, m, req); + ep->cfg.rx_msg_cb(ep, m, req); if (req) osmo_pfcp_queue_del(prev_msg); } @@ -402,7 +429,7 @@ return -EIO; msgb_put(msg, rc); - OSMO_ASSERT(ep->rx_msg); + OSMO_ASSERT(ep->cfg.rx_msg_cb); /* This may be a bundle of PFCP messages. Parse and receive each message received, by shifting l4h * through the message bundle. */ @@ -436,8 +463,8 @@ /* close the existing socket, if any */ osmo_pfcp_endpoint_close(ep); - if (!ep->rx_msg) { - LOGP(DLPFCP, LOGL_ERROR, "missing rx_msg cb at osmo_pfcp_endpoint\n"); + if (!ep->cfg.rx_msg_cb) { + LOGP(DLPFCP, LOGL_ERROR, "missing cfg.rx_msg_cb at osmo_pfcp_endpoint\n"); return -EINVAL; } @@ -483,3 +510,31 @@ llist_for_each_entry(qe, &ep->sent_responses, entry) osmo_pfcp_msg_invalidate_ctx(qe->m, deleted_fi); } + +/* Return the cfg for an endpoint, guaranteed to return non-NULL for a valid ep. */ +const struct osmo_pfcp_endpoint_cfg *osmo_pfcp_endpoint_get_cfg(const struct osmo_pfcp_endpoint *ep) +{ + return &ep->cfg; +} + +/* Shorthand for &osmo_pfcp_endpoint_get_cfg(ep)->priv */ +void *osmo_pfcp_endpoint_get_priv(const struct osmo_pfcp_endpoint *ep) +{ + return ep->cfg.priv; +} + +uint32_t osmo_pfcp_endpoint_get_recovery_timestamp(const struct osmo_pfcp_endpoint *ep) +{ + return ep->recovery_time_stamp; +} + +void osmo_pfcp_endpoint_set_seq_nr_state(struct osmo_pfcp_endpoint *ep, uint32_t seq_nr_state) +{ + ep->seq_nr_state = seq_nr_state; +} + +/* Return true when the retransmission queues contain any PFCP messages, false when the queues are empty. */ +bool osmo_pfcp_endpoint_retrans_queue_is_busy(const struct osmo_pfcp_endpoint *ep) +{ + return !(llist_empty(&ep->sent_requests) && llist_empty(&ep->sent_responses)); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: If80c35c6a942bf9593781b5a6bc28ba37323ce5e Gerrit-Change-Number: 28754 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: apply refactoring of osmo_pfcp_msg_alloc API

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/28753 to look at the new patch set (#3). Change subject: apply refactoring of osmo_pfcp_msg_alloc API ...................................................................... apply refactoring of osmo_pfcp_msg_alloc API libosmo-pfcp I0d71134e42932cc72992eba73a15e82bc7cd11bd clarifies the osmo_pfcp_msg_alloc functions, apply the necessary changes here. Related: SYS#5599 Depends: I0d71134e42932cc72992eba73a15e82bc7cd11bd (libosmo-pfcp) Change-Id: I73e6da3b80f05e9408c81f41ac05d6578b8e31cf --- M src/osmo-pfcp-tool/pfcp_tool_vty.c M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_peer.c 3 files changed, 24 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/53/28753/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I73e6da3b80f05e9408c81f41ac05d6578b8e31cf Gerrit-Change-Number: 28753 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: add contrib/set_cap_net_admin.sh

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28311 ) Change subject: add contrib/set_cap_net_admin.sh ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > Doesn't look valid points to me. […] can we please skip this discussion, it is a meaningless script under contrib/ without bearing on anything at all. if even a single person's life is made easier from having something in contrib/ then there is no need to pick that apart. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: If31c304e2602d3c37d5d8a5a2705417b2fc4686c Gerrit-Change-Number: 28311 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 23 Jul 2022 14:46:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: cp_peer chart wip

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28752 ) Change subject: cp_peer chart wip ...................................................................... Abandoned accidental push -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Iabb53b291c47901892eb68c176622e1e49ed5562 Gerrit-Change-Number: 28752 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: ladder charts

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28751 ) Change subject: ladder charts ...................................................................... Abandoned accidental push -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ie8c1b1fa50cd4f1569f0fcb02d42c713e6e49cad Gerrit-Change-Number: 28751 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: cp_peer chart wip

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/28752 ) Change subject: cp_peer chart wip ...................................................................... cp_peer chart wip Related: SYS#5895 Change-Id: Iabb53b291c47901892eb68c176622e1e49ed5562 --- M doc/charts/pfcp_cp_peer_fsm.dot 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/52/28752/1 diff --git a/doc/charts/pfcp_cp_peer_fsm.dot b/doc/charts/pfcp_cp_peer_fsm.dot index 101fe07..ec0d1fd 100644 --- a/doc/charts/pfcp_cp_peer_fsm.dot +++ b/doc/charts/pfcp_cp_peer_fsm.dot @@ -4,6 +4,7 @@ cp [label="CP function",shape="box"] +cp -> DISABLED [label="cp_peer_alloc()"] cp -> WAIT_ASSOC_SETUP_RESP [label="cp_peer_associate()"] txrx [label="PFCP socket",shape="box"] -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Iabb53b291c47901892eb68c176622e1e49ed5562 Gerrit-Change-Number: 28752 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: apply refactoring of osmo_pfcp_msg_alloc API

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/28753 ) Change subject: apply refactoring of osmo_pfcp_msg_alloc API ...................................................................... apply refactoring of osmo_pfcp_msg_alloc API libosmo-pfcp I0d71134e42932cc72992eba73a15e82bc7cd11bd clarifies the osmo_pfcp_msg_alloc functions, apply the necessary changes here. Related: SYS#5599 Related: I0d71134e42932cc72992eba73a15e82bc7cd11bd (libosmo-pfcp) Change-Id: I73e6da3b80f05e9408c81f41ac05d6578b8e31cf --- M src/osmo-pfcp-tool/pfcp_tool_vty.c M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_peer.c 3 files changed, 24 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/53/28753/1 diff --git a/src/osmo-pfcp-tool/pfcp_tool_vty.c b/src/osmo-pfcp-tool/pfcp_tool_vty.c index 2943c76..8593217 100644 --- a/src/osmo-pfcp-tool/pfcp_tool_vty.c +++ b/src/osmo-pfcp-tool/pfcp_tool_vty.c @@ -193,8 +193,7 @@ return CMD_WARNING; } - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, - OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); + m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); m->ies.assoc_setup_req.recovery_time_stamp = g_pfcp_tool->ep->recovery_time_stamp; m->ies.assoc_setup_req.cp_function_features_present = true; @@ -222,7 +221,9 @@ return CMD_WARNING; } - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, 0); + /* Allocate using API function to have the usual talloc destructor set up, then copy the last request or + * response over it. */ + m = osmo_pfcp_msg_alloc_rx(OTC_SELECT, &peer->remote_addr); if (strcmp(argv[0], "req") == 0) *m = peer->last_req; else @@ -392,8 +393,7 @@ }; osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, - OSMO_PFCP_MSGT_SESSION_EST_REQ); + m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_EST_REQ); m->h.seid_present = true; /* the UPF has yet to assign a SEID for itself, no matter what SEID we (the CPF) use for this session */ m->h.seid = 0; @@ -567,8 +567,7 @@ }; osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, - OSMO_PFCP_MSGT_SESSION_EST_REQ); + m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_EST_REQ); m->h.seid_present = true; m->h.seid = 0; /* GTP tunmap: remove header from both directions, and add header in both directions */ @@ -688,8 +687,7 @@ }; osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, - OSMO_PFCP_MSGT_SESSION_MOD_REQ); + m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_MOD_REQ); m->h.seid_present = true; m->h.seid = session->up_f_seid.seid; m->ies.session_mod_req = (struct osmo_pfcp_msg_session_mod_req){ @@ -732,8 +730,7 @@ return CMD_WARNING; } - m = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, &g_pfcp_tool->ep->cfg.local_node_id, NULL, - OSMO_PFCP_MSGT_SESSION_DEL_REQ); + m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_DEL_REQ); m->h.seid_present = true; m->h.seid = session->up_f_seid.seid; diff --git a/src/osmo-upf/up_endpoint.c b/src/osmo-upf/up_endpoint.c index b33e112..ef3702a 100644 --- a/src/osmo-upf/up_endpoint.c +++ b/src/osmo-upf/up_endpoint.c @@ -62,13 +62,12 @@ } static void up_ep_rx_not_impl_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m, - enum osmo_pfcp_message_type resp_msgt, - const struct osmo_pfcp_ie_node_id *node_id, enum osmo_pfcp_cause cause) + enum osmo_pfcp_message_type resp_msgt, enum osmo_pfcp_cause cause) { struct osmo_pfcp_msg *tx; enum osmo_pfcp_cause *tx_cause; OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "message type not implemented\n"); - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, resp_msgt); + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, resp_msgt); tx_cause = osmo_pfcp_msg_cause(tx); if (tx_cause) *tx_cause = cause; @@ -77,7 +76,7 @@ static void up_ep_rx_pfd_mgmt_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) { - up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_PFD_MGMT_RESP, NULL, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); + up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_PFD_MGMT_RESP, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); } static void up_ep_rx_assoc_setup_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) @@ -95,8 +94,7 @@ if (!m->ctx.peer_fi) { struct osmo_pfcp_msg *tx; OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot update association\n"); - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, OSMO_PFCP_MSGT_ASSOC_UPDATE_RESP); - /* FIXME set node_id, cause */ + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_ASSOC_UPDATE_RESP); osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, tx); return; } @@ -108,8 +106,7 @@ if (!m->ctx.peer_fi) { struct osmo_pfcp_msg *tx; OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated. Sending ACK response anyway\n"); - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, OSMO_PFCP_MSGT_ASSOC_RELEASE_RESP); - /* FIXME set node_id, cause */ + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_ASSOC_RELEASE_RESP); osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, tx); return; } @@ -118,14 +115,13 @@ static void up_ep_rx_node_report_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) { - up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_NODE_REPORT_RESP, NULL /* FIXME? */, - OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); + up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_NODE_REPORT_RESP, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); } static void up_ep_rx_session_set_del_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) { up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_SESSION_SET_DEL_RESP, - &up_ep->pfcp_ep->cfg.local_node_id, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); + OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); } static void up_ep_rx_session_est_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) @@ -133,7 +129,7 @@ if (!m->ctx.peer_fi) { struct osmo_pfcp_msg *tx; OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot establish session\n"); - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, OSMO_PFCP_MSGT_SESSION_EST_RESP); + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_EST_RESP); tx->ies.session_est_resp.cause = OSMO_PFCP_CAUSE_NO_ESTABLISHED_PFCP_ASSOC; osmo_pfcp_endpoint_tx(up_ep->pfcp_ep, tx); return; @@ -146,8 +142,7 @@ if (!m->ctx.session_fi) { /* Session not found. */ struct osmo_pfcp_msg *tx; - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, - OSMO_PFCP_MSGT_SESSION_MOD_RESP); + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_MOD_RESP); if (!m->ctx.peer_fi) { /* Not even the peer is associated. */ OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot modify session\n"); @@ -169,7 +164,7 @@ if (!m->ctx.session_fi) { /* Session not found. */ struct osmo_pfcp_msg *tx; - tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, &up_ep->pfcp_ep->cfg.local_node_id, m, OSMO_PFCP_MSGT_SESSION_DEL_RESP); + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_SESSION_DEL_RESP); if (!m->ctx.peer_fi) { /* Not even the peer is associated. */ OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, "Peer is not associated, cannot delete session\n"); @@ -188,7 +183,7 @@ static void up_ep_rx_session_rep_req(struct up_endpoint *up_ep, const struct osmo_pfcp_msg *m) { - up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_SESSION_REP_RESP, NULL, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); + up_ep_rx_not_impl_req(up_ep, m, OSMO_PFCP_MSGT_SESSION_REP_RESP, OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED); } static void up_endpoint_rx_cb(struct osmo_pfcp_endpoint *ep, struct osmo_pfcp_msg *m, struct osmo_pfcp_msg *req) diff --git a/src/osmo-upf/up_peer.c b/src/osmo-upf/up_peer.c index d0d7dbd..633e458 100644 --- a/src/osmo-upf/up_peer.c +++ b/src/osmo-upf/up_peer.c @@ -194,9 +194,11 @@ struct osmo_pfcp_msg *up_peer_init_tx(struct up_peer *peer, struct osmo_pfcp_msg *in_reply_to, enum osmo_pfcp_message_type message_type) { - struct osmo_pfcp_msg *tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, &peer->remote_addr, - &peer->up_endpoint->pfcp_ep->cfg.local_node_id, - in_reply_to, message_type); + struct osmo_pfcp_msg *tx; + if (in_reply_to) + tx = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, in_reply_to, message_type); + else + tx = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, message_type); up_peer_set_msg_ctx(peer, tx); return tx; } -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I73e6da3b80f05e9408c81f41ac05d6578b8e31cf Gerrit-Change-Number: 28753 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: ladder charts

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/28751 ) Change subject: ladder charts ...................................................................... ladder charts Related: SYS#5599 Change-Id: Ie8c1b1fa50cd4f1569f0fcb02d42c713e6e49cad --- M doc/charts/Makefile.am A doc/charts/pfcp_msgs.ladder A doc/charts/pfcp_msgs_gtp.ladder 3 files changed, 219 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/51/28751/1 diff --git a/doc/charts/Makefile.am b/doc/charts/Makefile.am index af0736d..99b35f5 100644 --- a/doc/charts/Makefile.am +++ b/doc/charts/Makefile.am @@ -19,6 +19,10 @@ $(builddir)/%.png: $(srcdir)/%.dot dot -Tpng $< > $@ +$(srcdir)/%.msc: $(srcdir)/%.ladder + @which ladder_to_msc.py || (echo 'PLEASE POINT YOUR $$PATH AT libosmocore/contrib/ladder_to_msc.py' && false) + ladder_to_msc.py -i $< -o $@ + .PHONY: poll poll: while true; do $(MAKE) msc dot; sleep 1; done diff --git a/doc/charts/pfcp_msgs.ladder b/doc/charts/pfcp_msgs.ladder new file mode 100644 index 0000000..21c23a4 --- /dev/null +++ b/doc/charts/pfcp_msgs.ladder @@ -0,0 +1,73 @@ +{hscale=1} +upf = User Plane function +cpf = Control Plane function + +cpf () . Look up UPF, + pick any one of the available + IP addrs for the UPF + +... +upf <> cpf not yet associated +upf () cpf reject any session related msgs +... + +upf < cpf PFCP Association Setup Request + CP function Node Id, features +upf > cpf PFCP Association Setup Response + UP function Node Id, features +upf <> cpf associated +upf () cpf start Heartbeat checking +... +upf < cpf Heartbeat Request +upf > cpf Heartbeat Response +... +upf > cpf Heartbeat Request +upf < cpf Heartbeat Response +... + +upf < cpf Session Establishment Request + CP Node-Id + CP F-SEID + 1+ Packet Detection Rule(s) + 1+ Forward Action Rule(s) +upf > cpf Session Establishment Response + +upf < cpf Session Modification Request +upf > cpf Session Modification Response + +upf < cpf Session Deletion Request +upf > cpf Session Deletion Response + +... +upf () cpf F-SEID: accept any other IP addrs than peer's Node Id +... + +--- Graceful release initiated by CP + +upf < cpf Association Update Request + with PFCP Association Release Preparation Start = 1 +upf > cpf Association Update Response +upf > cpf Session Report Request + to report non-zero usage reports, + at least one message per PFCP Session +upf < cpf Association Release Request +upf > cpf Association Release Response + +--- Graceful release initiated by UP + +upf > cpf Association Update Request + with PFCP Association Release Preparation = 1 +cpf <> . refrain from establishing sessions +upf < cpf Association Update Response +upf < cpf Session Deletion Request(s) + to collect usage reports + per session +upf > cpf Session Deletion Response(s) +cpf () . wait Graceful Release Period +upf < cpf Association Release Request +upf > cpf Association Release Response + +--- Release (immediate) + +upf < cpf Association Release Request +upf > cpf Association Release Response diff --git a/doc/charts/pfcp_msgs_gtp.ladder b/doc/charts/pfcp_msgs_gtp.ladder new file mode 100644 index 0000000..b73fb51 --- /dev/null +++ b/doc/charts/pfcp_msgs_gtp.ladder @@ -0,0 +1,142 @@ +{hscale=1} +sgsn = SGSN + 123.44.0.9 +sgwc = SGW-C + 123.44.0.5 +sgwu = SGW-U + 123.44.0.6 +pgwc = PGW-C + 123.44.0.7 +pgwu = PGW-U + 123.44.0.8 + +sgsn <-> sgwc S4-C GTPv2-C +sgwc <-> sgwu Sxa PFCP +sgsn <-> sgwu S4-U GTPv1-U +sgwc <-> pgwc S5-C GTPv2-C +pgwc <-> pgwu Sxb PFCP +sgwu <-> pgwu S5-U GTPv1-U + +... + +sgsn -> sgwc GTP Create Session Request +sgsn [] sgwc F-TEID S11 = 123.44.0.9,0x004 + F-TEID S5 = 123.44.0.7,0x000 + PDN addr alloc = IPv4 192.168.100.2 + +||| +||| + +sgwc -> sgwu PFCP Session Establishment Request +sgwc [] sgwu 2x Create PDR + F-TEID = CHOOSE + FAR = NOCP,BUFF + +||| +||| + +sgwc <- sgwu PFCP Session Establishment Response +sgwc [] sgwu Created PDR F-TEID 123.44.0.6,0x015 + Created PDR F-TEID 123.44.0.6,0x016 + +||| +||| + +sgwc -> pgwc GTP Create Session Request +sgwc [] pgwc F-TEID S5 = 123.44.0.5,0x00b + PDN addr alloc = IPv4 192.168.100.2 + Bearer Ctx: F-TEID S5 = 123.44.0.6,0x015 + +||| +||| + +pgwc -> pgwu PFCP Session Establishment Request +pgwc [] pgwu Create PDR 1: + PDI: src-iface Core, UE IPv4 192.168.100.2 + FAR-1: FORW, dst-iface Access, + hdr creation: GTP-U 123.44.0.6,0x015 + + Create PDR 2: + PDI: src-iface Access, F-TEID = CHOOSE id:05 + hdr removal: GTP-U + FAR-2: FORW, dst-iface Core + + Create PDR 3: + PDI: src-iface CP-function, F-TEID = CHOOSE + hdr removal: GTP-U + FAR-1 + + Create PDR 4: + PDI: src-iface Access, F-TEID = CHOOSE id:05, SDF Filter + hdr removal: GTP-U + FAR-3: FORW, dst-iface CP-Function, + hdr creation: GTP-U 123.44.0.7,0x00b + +||| + +pgwc <- pgwu PFCP Session Establishment Response +pgwc [] pgwu Created PDR-1 + Created PDR-2: F-TEID = 123.44.0.8,0x01e + Created PDR-3: F-TEID = 123.44.0.8,0x01f + Created PDR-4: F-TEID = 123.44.0.8,0x01e + +||| +||| + +sgwc <- pgwc GTP Create Session Response +sgwc [] pgwc TEID: 0x00b + F-TEID: 123.44.0.7,0x00b + PDN Addr: 192.168.100.2 + Bearer Ctx: F-TEID S5 123.44.0.8,0x01e + +||| +||| + +sgwc -> sgwu PFCP Session Modification Request +sgwc [] sgwu Update FAR-2: FORW, dst-iface Core, + hdr creation GTP-U 123.44.0.8,0x01e + +||| + +sgwc <- sgwu PFCP Session Modification Response + +||| +||| + +sgsn <- sgwc GTP Create Session Response +sgsn [] sgwc TEID: 0x004 + F-TEID S11/S4: 123.44.0.5,0x007 + F-TEID S5/S8: 123.44.0.7,0x00b + PDN Addr: 192.168.100.2 + Bearer Ctx: + F-TEID S1-U: 123.44.0.6,0x016 + F-TEID S5/S8: 123.44.0.8,0x01e + +||| +||| + +sgsn -> sgwc GTP Modify Bearer Request +sgsn [] sgwc TEID: 0x007 + Bearer Ctx: + F-TEID S1-U: 192.168.104.167,0x32adb2ad + +||| +||| + +sgwc -> sgwu PFCP Session Modification Request +sgwc [] sgwu Update FAR-1: FORW, dst-iface Access, + hdr creation: GTP-U 192.168.104.167,0x32adb2ad + +||| +||| + + +sgwc <- sgwu PFCP Session Modification Response + +||| + +sgsn <- sgwc GTP Modify Bearer Response +sgsn [] sgwc TEID: 0x004 + Bearer Ctx: + F-TEID S1-U: 192.168.104.167,0x32adb2ad + -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ie8c1b1fa50cd4f1569f0fcb02d42c713e6e49cad Gerrit-Change-Number: 28751 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in libosmo-pfcp[master]: clarify osmo_pfcp_msg alloc API

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28750 ) Change subject: clarify osmo_pfcp_msg alloc API ...................................................................... clarify osmo_pfcp_msg alloc API Looking at the osmo_pfcp_msg_alloc API with a bit of distance now, I found that: - it is confusing to have a single function for req and resp. A resp may pass remote_addr as NULL, and a req may pass in_reply_to as NULL. Make this much more obvious with separate req/resp functions. - the osmo_pfcp_endpoint_tx() implicitly puts the local Node ID into sent PFCP messages, so the local_node_id arg for msg alloc is redundant. Drop that. Refactor without backwards compat, because we have not yet officially released this API. This requires a fixup patch to osmo-upf.git (and affects unmerged patches to osmo-hnbgw.git). Related: SYS#5599 Related: I73e6da3b80f05e9408c81f41ac05d6578b8e31cf (osmo-upf) Change-Id: I0d71134e42932cc72992eba73a15e82bc7cd11bd --- M include/osmocom/pfcp/pfcp_cp_peer.h M include/osmocom/pfcp/pfcp_msg.h M src/libosmo-pfcp/pfcp_cp_peer.c M src/libosmo-pfcp/pfcp_endpoint.c M src/libosmo-pfcp/pfcp_msg.c 5 files changed, 48 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/50/28750/1 diff --git a/include/osmocom/pfcp/pfcp_cp_peer.h b/include/osmocom/pfcp/pfcp_cp_peer.h index 8c6e448..e555a5f 100644 --- a/include/osmocom/pfcp/pfcp_cp_peer.h +++ b/include/osmocom/pfcp/pfcp_cp_peer.h @@ -58,6 +58,9 @@ const struct osmo_sockaddr *remote_addr); int osmo_pfcp_cp_peer_associate(struct osmo_pfcp_cp_peer *cp_peer); bool osmo_pfcp_cp_peer_is_associated(const struct osmo_pfcp_cp_peer *cp_peer); -struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_msg_tx(struct osmo_pfcp_cp_peer *cp_peer, - enum osmo_pfcp_message_type msg_type); +struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_req(struct osmo_pfcp_cp_peer *cp_peer, + enum osmo_pfcp_message_type msg_type); +struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_resp(struct osmo_pfcp_cp_peer *cp_peer, + const struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type msg_type); void osmo_pfcp_cp_peer_set_msg_ctx(struct osmo_pfcp_cp_peer *cp_peer, struct osmo_pfcp_msg *m); diff --git a/include/osmocom/pfcp/pfcp_msg.h b/include/osmocom/pfcp/pfcp_msg.h index 2833408..4affa54 100644 --- a/include/osmocom/pfcp/pfcp_msg.h +++ b/include/osmocom/pfcp/pfcp_msg.h @@ -169,10 +169,10 @@ int osmo_pfcp_msg_decode_tlv(struct osmo_pfcp_msg *m, struct osmo_gtlv_load *tlv); struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_rx(void *ctx, const struct osmo_sockaddr *remote_addr); -struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx(void *ctx, const struct osmo_sockaddr *remote_addr, - const struct osmo_pfcp_ie_node_id *local_node_id, - const struct osmo_pfcp_msg *in_reply_to, - enum osmo_pfcp_message_type msg_type); +struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx_req(void *ctx, const struct osmo_sockaddr *remote_addr, + enum osmo_pfcp_message_type msg_type); +struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx_resp(void *ctx, const struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type msg_type); void osmo_pfcp_msg_invalidate_ctx(struct osmo_pfcp_msg *m, struct osmo_fsm_inst *deleted_fi); diff --git a/src/libosmo-pfcp/pfcp_cp_peer.c b/src/libosmo-pfcp/pfcp_cp_peer.c index c47b440..e1dd9ac 100644 --- a/src/libosmo-pfcp/pfcp_cp_peer.c +++ b/src/libosmo-pfcp/pfcp_cp_peer.c @@ -160,7 +160,7 @@ struct osmo_pfcp_cp_peer *cp_peer = fi->priv; struct osmo_pfcp_msg *m; - m = osmo_pfcp_cp_peer_new_msg_tx(cp_peer, OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); + m = osmo_pfcp_cp_peer_new_req(cp_peer, OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); m->ies.assoc_setup_req.recovery_time_stamp = cp_peer->ep->recovery_time_stamp; m->ies.assoc_setup_req.cp_function_features_present = true; @@ -391,14 +391,25 @@ osmo_use_count_get_put(m->ctx.peer_use_count, m->ctx.peer_use_token, 1); } -struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_msg_tx(struct osmo_pfcp_cp_peer *cp_peer, - enum osmo_pfcp_message_type msg_type) +/* Allocate a new PFCP request message to be sent to cp_peer->remote_addr. */ +struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_req(struct osmo_pfcp_cp_peer *cp_peer, + enum osmo_pfcp_message_type msg_type) { struct osmo_pfcp_msg *m; - m = osmo_pfcp_msg_alloc_tx(cp_peer->ep, &cp_peer->remote_addr, &cp_peer->ep->cfg.local_node_id, NULL, - msg_type); - if (!m) - return m; + m = osmo_pfcp_msg_alloc_tx_req(cp_peer->ep, &cp_peer->remote_addr, msg_type); + OSMO_ASSERT(m); + osmo_pfcp_cp_peer_set_msg_ctx(cp_peer, m); + return m; +} + +/* Allocate a new PFCP response message to be sent to cp_peer->remote_addr. */ +struct osmo_pfcp_msg *osmo_pfcp_cp_peer_new_resp(struct osmo_pfcp_cp_peer *cp_peer, + const struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type msg_type) +{ + struct osmo_pfcp_msg *m; + m = osmo_pfcp_msg_alloc_tx_resp(cp_peer->ep, in_reply_to, msg_type); + OSMO_ASSERT(m); osmo_pfcp_cp_peer_set_msg_ctx(cp_peer, m); return m; } diff --git a/src/libosmo-pfcp/pfcp_endpoint.c b/src/libosmo-pfcp/pfcp_endpoint.c index f446858..6162086 100644 --- a/src/libosmo-pfcp/pfcp_endpoint.c +++ b/src/libosmo-pfcp/pfcp_endpoint.c @@ -242,8 +242,7 @@ int osmo_pfcp_endpoint_tx_heartbeat_req(struct osmo_pfcp_endpoint *ep, const struct osmo_sockaddr *remote_addr) { - struct osmo_pfcp_msg *tx = osmo_pfcp_msg_alloc_tx(OTC_SELECT, remote_addr, NULL, NULL, - OSMO_PFCP_MSGT_HEARTBEAT_REQ); + struct osmo_pfcp_msg *tx = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, remote_addr, OSMO_PFCP_MSGT_HEARTBEAT_REQ); tx->ies.heartbeat_req.recovery_time_stamp = ep->recovery_time_stamp; tx->h.sequence_nr = osmo_pfcp_next_seq_nr(&ep->seq_nr_state); return osmo_pfcp_endpoint_tx_data(ep, tx); @@ -326,7 +325,7 @@ if (m->h.message_type == OSMO_PFCP_MSGT_HEARTBEAT_REQ) { /* Directly answer with a Heartbeat Response. */ - struct osmo_pfcp_msg *resp = osmo_pfcp_msg_alloc_tx(OTC_SELECT, NULL, NULL, m, OSMO_PFCP_MSGT_HEARTBEAT_RESP); + struct osmo_pfcp_msg *resp = osmo_pfcp_msg_alloc_tx_resp(OTC_SELECT, m, OSMO_PFCP_MSGT_HEARTBEAT_RESP); resp->ies.heartbeat_resp.recovery_time_stamp = ep->recovery_time_stamp; osmo_pfcp_endpoint_tx_data(ep, resp); /* Still also dispatch the Rx event to the peer. */ diff --git a/src/libosmo-pfcp/pfcp_msg.c b/src/libosmo-pfcp/pfcp_msg.c index 9d65efc..5f55575 100644 --- a/src/libosmo-pfcp/pfcp_msg.c +++ b/src/libosmo-pfcp/pfcp_msg.c @@ -418,31 +418,39 @@ return rx; } -struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx(void *ctx, const struct osmo_sockaddr *remote_addr, - const struct osmo_pfcp_ie_node_id *node_id, - const struct osmo_pfcp_msg *in_reply_to, - enum osmo_pfcp_message_type msg_type) +static struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx(void *ctx, const struct osmo_sockaddr *remote_addr, + const struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type msg_type) { struct osmo_pfcp_msg *tx; if (!remote_addr && in_reply_to) remote_addr = &in_reply_to->remote_addr; OSMO_ASSERT(remote_addr); tx = _osmo_pfcp_msg_alloc(ctx, remote_addr); + OSMO_ASSERT(tx); tx->is_response = osmo_pfcp_msgtype_is_response(msg_type); tx->h.message_type = msg_type; if (in_reply_to) tx->h.sequence_nr = in_reply_to->h.sequence_nr; osmo_pfcp_msg_set_memb_ofs(tx); - - /* Write the local node id data to the correct tx->ies.* member. */ - if (node_id) { - struct osmo_pfcp_ie_node_id *tx_node_id = osmo_pfcp_msg_node_id(tx); - if (tx_node_id) - *tx_node_id = *node_id; - } return tx; } +/* Allocate a new PFCP Request message to be transmitted to a peer. */ +struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx_req(void *ctx, const struct osmo_sockaddr *remote_addr, + enum osmo_pfcp_message_type msg_type) +{ + return osmo_pfcp_msg_alloc_tx(ctx, remote_addr, NULL, msg_type); +} + +/* Allocate a new PFCP Response message to be transmitted to a peer, as a response to a received PFCP message. + * Pass the received PFCP Request in in_reply_to; take the remote address and sequence nr from in_reply_to. */ +struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx_resp(void *ctx, const struct osmo_pfcp_msg *in_reply_to, + enum osmo_pfcp_message_type msg_type) +{ + return osmo_pfcp_msg_alloc_tx(ctx, NULL, in_reply_to, msg_type); +} + static int osmo_pfcp_msg_destructor(struct osmo_pfcp_msg *m) { OSMO_LOG_PFCP_MSG(m, LOGL_DEBUG, "discarding\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I0d71134e42932cc72992eba73a15e82bc7cd11bd Gerrit-Change-Number: 28750 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in libosmo-pfcp[master]: fix wrong constants used in osmo_pfcp_tdefs (typo)

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28749 ) Change subject: fix wrong constants used in osmo_pfcp_tdefs (typo) ...................................................................... fix wrong constants used in osmo_pfcp_tdefs (typo) s/MSGT/TIMER Related: SYS#5599 Change-Id: Iaecce86064b65aa003e9903d09f60d760e0689c3 --- M src/libosmo-pfcp/pfcp_endpoint.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-pfcp/pfcp_endpoint.c b/src/libosmo-pfcp/pfcp_endpoint.c index 32bcd0e..f446858 100644 --- a/src/libosmo-pfcp/pfcp_endpoint.c +++ b/src/libosmo-pfcp/pfcp_endpoint.c @@ -78,10 +78,10 @@ } struct osmo_tdef osmo_pfcp_tdefs[] = { - { .T = OSMO_PFCP_MSGT_HEARTBEAT_REQ, .default_val = 15, .unit = OSMO_TDEF_S, + { .T = OSMO_PFCP_TIMER_HEARTBEAT_REQ, .default_val = 15, .unit = OSMO_TDEF_S, .desc = "PFCP Heartbeat Request period, how long to wait between issuing requests" }, - { .T = OSMO_PFCP_MSGT_HEARTBEAT_RESP, .default_val = 15, .unit = OSMO_TDEF_S, + { .T = OSMO_PFCP_TIMER_HEARTBEAT_RESP, .default_val = 15, .unit = OSMO_TDEF_S, .desc = "PFCP Heartbeat Response timeout, the time after which to regard a non-responding peer as disconnected" }, { .T = OSMO_PFCP_TIMER_GRACEFUL_REL, .default_val = 15, .unit = OSMO_TDEF_S, -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: Iaecce86064b65aa003e9903d09f60d760e0689c3 Gerrit-Change-Number: 28749 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022