From 4fabe90c7f2a1e7b956b6c79945f6d3679c8ccf9 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Thu, 5 Oct 2023 11:02:42 -0400 Subject: [PATCH] lib,*: add vrf id to pbr rule results zapi message The iprule/pbr rule object has a vrf id, and zebra uses that internally, but the vrf id isn't returned to clients who install rules and are waiting for results. Include the vrf_id sent by the client in the zapi result notification message; update the existing clients so they decode the id. Signed-off-by: Mark Stapp --- zebra/zapi_msg.c | 4 +++- zebra/zebra_dplane.c | 7 +++++++ zebra/zebra_dplane.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index 86e4f2570cbe..e59c49f15e1c 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -849,7 +849,9 @@ void zsend_rule_notify_owner(const struct zebra_dplane_ctx *ctx, s = stream_new(ZEBRA_MAX_PACKET_SIZ); - zclient_create_header(s, ZEBRA_RULE_NOTIFY_OWNER, VRF_DEFAULT); + zclient_create_header(s, ZEBRA_RULE_NOTIFY_OWNER, + dplane_ctx_rule_get_vrfid(ctx)); + stream_put(s, ¬e, sizeof(note)); stream_putl(s, dplane_ctx_rule_get_seq(ctx)); stream_putl(s, dplane_ctx_rule_get_priority(ctx)); diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c index 03d7bb88a218..099a6e2725c1 100644 --- a/zebra/zebra_dplane.c +++ b/zebra/zebra_dplane.c @@ -3031,6 +3031,13 @@ void dplane_ctx_rule_set_dp_flow_ptr(struct zebra_dplane_ctx *ctx, ctx->u.rule.new.dp_flow_ptr = dp_flow_ptr; } +vrf_id_t dplane_ctx_rule_get_vrfid(const struct zebra_dplane_ctx *ctx) +{ + DPLANE_CTX_VALID(ctx); + + return ctx->u.rule.new.prule.vrf_id; +} + /*********************************************************************** * PBR RULE ACCESSORS - end **********************************************************************/ diff --git a/zebra/zebra_dplane.h b/zebra/zebra_dplane.h index 4d4a17bbaeba..87c2e0365677 100644 --- a/zebra/zebra_dplane.h +++ b/zebra/zebra_dplane.h @@ -740,6 +740,8 @@ intptr_t dplane_ctx_rule_get_old_dp_flow_ptr(const struct zebra_dplane_ctx *ctx); void dplane_ctx_rule_set_dp_flow_ptr(struct zebra_dplane_ctx *ctx, intptr_t dp_flow_ptr); +vrf_id_t dplane_ctx_rule_get_vrfid(const struct zebra_dplane_ctx *ctx); + /* Accessors for policy based routing iptable information */ struct zebra_pbr_iptable; void dplane_ctx_get_pbr_iptable(const struct zebra_dplane_ctx *ctx,