diff options
| author | Mark Stapp <mjs@voltanet.io> | 2021-11-03 15:10:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 15:10:09 -0400 |
| commit | f154a68dbe0f489b72ce744ff48001e136c808bc (patch) | |
| tree | 11cea7bddb3ffa5fbcd2527323300ce454d1cede /zebra/zebra_dplane.c | |
| parent | 91ee7e737b279199c7c7c58e2371f90e5a6a8e7e (diff) | |
| parent | e108096b1dbb4baec623dd832e8b0d5217778bcb (diff) | |
Merge pull request #9915 from pguibert6WIND/flowspec_dplane_missing
Flowspec dplane missing
Diffstat (limited to 'zebra/zebra_dplane.c')
| -rw-r--r-- | zebra/zebra_dplane.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c index 9e9844390d..3d258e0829 100644 --- a/zebra/zebra_dplane.c +++ b/zebra/zebra_dplane.c @@ -341,7 +341,7 @@ struct zebra_dplane_ctx { struct dplane_rule_info rule; struct zebra_pbr_iptable iptable; struct zebra_pbr_ipset ipset; - union { + struct { struct zebra_pbr_ipset_entry entry; struct zebra_pbr_ipset_info info; } ipset_entry; @@ -2166,6 +2166,7 @@ bool dplane_ctx_get_pbr_ipset(const struct zebra_dplane_ctx *ctx, ctx->zd_op == DPLANE_OP_IPSET_ENTRY_DELETE) { memset(ipset, 0, sizeof(struct zebra_pbr_ipset)); ipset->type = ctx->u.ipset_entry.info.type; + ipset->family = ctx->u.ipset_entry.info.family; memcpy(&ipset->ipset_name, &ctx->u.ipset_entry.info.ipset_name, ZEBRA_IPSET_NAME_SIZE); } else @@ -2943,6 +2944,7 @@ dplane_ctx_ipset_entry_init(struct zebra_dplane_ctx *ctx, enum dplane_op_e op, sizeof(struct zebra_pbr_ipset_entry)); ctx->u.ipset_entry.entry.backpointer = NULL; ctx->u.ipset_entry.info.type = ipset->type; + ctx->u.ipset_entry.info.family = ipset->family; memcpy(&ctx->u.ipset_entry.info.ipset_name, &ipset->ipset_name, ZEBRA_IPSET_NAME_SIZE); |