proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-17 22:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Recent Merge broke --enable-werror

Browse Source 
Recent code broke upon compiling with --enable-dev-build
and --enable-werror.  Fix.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-10-27 07:57:43 -04:00
parent f1506cf36b
commit cbefb650bc
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zebra/zebra_router.c
View File

@ -30,6 +30,7 @@
#include "zebra_mlag.h" #include "zebra_mlag.h"
#include "zebra_nhg.h" #include "zebra_nhg.h"
#include "debug.h" #include "debug.h"
#include "zebra_script.h"
DEFINE_MTYPE_STATIC(ZEBRA, RIB_TABLE_INFO, "RIB table info"); DEFINE_MTYPE_STATIC(ZEBRA, RIB_TABLE_INFO, "RIB table info");
DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_RT_TABLE, "Zebra VRF table"); DEFINE_MTYPE_STATIC(ZEBRA, ZEBRA_RT_TABLE, "Zebra VRF table");

9
zebra/zebra_script.c
View File

@ -256,7 +256,7 @@ void lua_pushzebra_dplane_ctx(lua_State *L, const struct zebra_dplane_ctx *ctx)
lua_setfield(L, -2, "rule"); lua_setfield(L, -2, "rule");
break; break;
case DPLANE_OP_IPTABLE_ADD: case DPLANE_OP_IPTABLE_ADD:
case DPLANE_OP_IPTABLE_DELETE: case DPLANE_OP_IPTABLE_DELETE: {
struct zebra_pbr_iptable iptable; struct zebra_pbr_iptable iptable;
dplane_ctx_get_pbr_iptable(ctx, &iptable); dplane_ctx_get_pbr_iptable(ctx, &iptable);
@ -300,10 +300,11 @@ void lua_pushzebra_dplane_ctx(lua_State *L, const struct zebra_dplane_ctx *ctx)
} }
lua_setfield(L, -2, "iptable"); lua_setfield(L, -2, "iptable");
break; break;
}
case DPLANE_OP_IPSET_ADD: case DPLANE_OP_IPSET_ADD:
case DPLANE_OP_IPSET_DELETE: case DPLANE_OP_IPSET_DELETE:
case DPLANE_OP_IPSET_ENTRY_ADD: case DPLANE_OP_IPSET_ENTRY_ADD:
case DPLANE_OP_IPSET_ENTRY_DELETE: case DPLANE_OP_IPSET_ENTRY_DELETE: {
struct zebra_pbr_ipset ipset; struct zebra_pbr_ipset ipset;
dplane_ctx_get_pbr_ipset(ctx, &ipset); dplane_ctx_get_pbr_ipset(ctx, &ipset);
@ -325,8 +326,11 @@ void lua_pushzebra_dplane_ctx(lua_State *L, const struct zebra_dplane_ctx *ctx)
} }
lua_setfield(L, -2, "ipset"); lua_setfield(L, -2, "ipset");
break; break;
}
case DPLANE_OP_ADDR_INSTALL: case DPLANE_OP_ADDR_INSTALL:
case DPLANE_OP_ADDR_UNINSTALL: case DPLANE_OP_ADDR_UNINSTALL:
case DPLANE_OP_INTF_ADDR_ADD:
case DPLANE_OP_INTF_ADDR_DEL:
break; break;
case DPLANE_OP_NEIGH_INSTALL: case DPLANE_OP_NEIGH_INSTALL:
case DPLANE_OP_NEIGH_UPDATE: case DPLANE_OP_NEIGH_UPDATE:
@ -409,6 +413,7 @@ void lua_pushzebra_dplane_ctx(lua_State *L, const struct zebra_dplane_ctx *ctx)
} }
lua_setfield(L, -2, "gre"); lua_setfield(L, -2, "gre");
case DPLANE_OP_NONE: case DPLANE_OP_NONE:
break;
} /* Dispatch by op code */ } /* Dispatch by op code */
} }