proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-03-24 09:12:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11244 from pguibert6WIND/flowspec_added_twice

Browse Source 
zebra: avoid pbr iptable added twice when used with flowspec
This commit is contained in:
Stephen Worley 2022-05-25 12:29:27 -04:00 committed by GitHub
commit 1ebae15eaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zebra/zapi_msg.c
View File

@ -876,9 +876,24 @@ void zsend_iptable_notify_owner(const struct zebra_dplane_ctx *ctx,
struct stream *s; struct stream *s;
struct zebra_pbr_iptable ipt; struct zebra_pbr_iptable ipt;
uint16_t cmd = ZEBRA_IPTABLE_NOTIFY_OWNER; uint16_t cmd = ZEBRA_IPTABLE_NOTIFY_OWNER;
struct zebra_pbr_iptable *ipt_hash;
enum dplane_op_e op = dplane_ctx_get_op(ctx);
dplane_ctx_get_pbr_iptable(ctx, &ipt); dplane_ctx_get_pbr_iptable(ctx, &ipt);
ipt_hash = hash_lookup(zrouter.iptable_hash, &ipt);
if (ipt_hash) {
if (op == DPLANE_OP_IPTABLE_ADD &&
CHECK_FLAG(ipt_hash->internal_flags,
IPTABLE_INSTALL_QUEUED))
UNSET_FLAG(ipt_hash->internal_flags,
IPTABLE_INSTALL_QUEUED);
else if (op == DPLANE_OP_IPTABLE_DELETE &&
CHECK_FLAG(ipt_hash->internal_flags,
IPTABLE_UNINSTALL_QUEUED))
UNSET_FLAG(ipt_hash->internal_flags,
IPTABLE_UNINSTALL_QUEUED);
}
if (IS_ZEBRA_DEBUG_PACKET) if (IS_ZEBRA_DEBUG_PACKET)
zlog_debug("%s: Notifying %s id %u note %u", __func__, zlog_debug("%s: Notifying %s id %u note %u", __func__,
zserv_command_string(cmd), ipt.unique, note); zserv_command_string(cmd), ipt.unique, note);

22
zebra/zebra_dplane.c
View File

@ -4550,6 +4550,17 @@ iptable_update_internal(enum dplane_op_e op, struct zebra_pbr_iptable *iptable)
struct zebra_dplane_ctx *ctx; struct zebra_dplane_ctx *ctx;
int ret; int ret;
if ((op == DPLANE_OP_IPTABLE_ADD &&
CHECK_FLAG(iptable->internal_flags, IPTABLE_INSTALL_QUEUED)) ||
(op == DPLANE_OP_IPTABLE_DELETE &&
CHECK_FLAG(iptable->internal_flags, IPTABLE_UNINSTALL_QUEUED))) {
if (IS_ZEBRA_DEBUG_DPLANE_DETAIL)
zlog_debug(
"update dplane ctx %s: iptable %s already in progress",
dplane_op2str(op), iptable->ipset_name);
return result;
}
ctx = dplane_ctx_alloc(); ctx = dplane_ctx_alloc();
ret = dplane_ctx_iptable_init(ctx, op, iptable); ret = dplane_ctx_iptable_init(ctx, op, iptable);
@ -4562,14 +4573,19 @@ done:
atomic_fetch_add_explicit(&zdplane_info.dg_iptable_in, 1, atomic_fetch_add_explicit(&zdplane_info.dg_iptable_in, 1,
memory_order_relaxed); memory_order_relaxed);
if (ret == AOK) if (ret == AOK) {
result = ZEBRA_DPLANE_REQUEST_QUEUED; result = ZEBRA_DPLANE_REQUEST_QUEUED;
else { if (op == DPLANE_OP_IPTABLE_ADD)
SET_FLAG(iptable->internal_flags,
IPTABLE_INSTALL_QUEUED);
else
SET_FLAG(iptable->internal_flags,
IPTABLE_UNINSTALL_QUEUED);
} else {
atomic_fetch_add_explicit(&zdplane_info.dg_iptable_errors, 1, atomic_fetch_add_explicit(&zdplane_info.dg_iptable_errors, 1,
memory_order_relaxed); memory_order_relaxed);
dplane_ctx_free(&ctx); dplane_ctx_free(&ctx);
} }
return result; return result;
} }

7
zebra/zebra_pbr.c
View File

@ -812,8 +812,11 @@ static void *pbr_iptable_alloc_intern(void *arg)
void zebra_pbr_add_iptable(struct zebra_pbr_iptable *iptable) void zebra_pbr_add_iptable(struct zebra_pbr_iptable *iptable)
{ {
(void)hash_get(zrouter.iptable_hash, iptable, pbr_iptable_alloc_intern); struct zebra_pbr_iptable *ipt_hash;
(void)dplane_pbr_iptable_add(iptable);
ipt_hash = hash_get(zrouter.iptable_hash, iptable,
pbr_iptable_alloc_intern);
(void)dplane_pbr_iptable_add(ipt_hash);
} }
void zebra_pbr_del_iptable(struct zebra_pbr_iptable *iptable) void zebra_pbr_del_iptable(struct zebra_pbr_iptable *iptable)

3
zebra/zebra_pbr.h
View File

@ -171,6 +171,9 @@ struct zebra_pbr_iptable {
struct list *interface_name_list; struct list *interface_name_list;
#define IPTABLE_INSTALL_QUEUED 1 << 1
#define IPTABLE_UNINSTALL_QUEUED 1 << 2
uint8_t internal_flags;
char ipset_name[ZEBRA_IPSET_NAME_SIZE]; char ipset_name[ZEBRA_IPSET_NAME_SIZE];
}; };