proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-10 21:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "zebra: Add ability to note that a address is NOPREFIXROUTE"

Browse Source 
This reverts commit e2b180cc90.
This commit is contained in:
Donatas Abraitis 2024-01-21 23:14:06 +02:00
parent fa68e7c285
commit 1c0dd8ce88
3 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zebra/if_netlink.c
View File

@ -1474,9 +1474,6 @@ int netlink_interface_addr_dplane(struct nlmsghdr *h, ns_id_t ns_id,
if (kernel_flags & IFA_F_SECONDARY) if (kernel_flags & IFA_F_SECONDARY)
dplane_ctx_intf_set_secondary(ctx); dplane_ctx_intf_set_secondary(ctx);
if (kernel_flags & IFA_F_NOPREFIXROUTE)
dplane_ctx_intf_set_noprefixroute(ctx);
/* Label */ /* Label */
if (tb[IFA_LABEL]) { if (tb[IFA_LABEL]) {
label = (char *)RTA_DATA(tb[IFA_LABEL]); label = (char *)RTA_DATA(tb[IFA_LABEL]);

15
zebra/zebra_dplane.c
View File

@ -230,7 +230,6 @@ struct dplane_intf_info {
#define DPLANE_INTF_BROADCAST (1 << 2) #define DPLANE_INTF_BROADCAST (1 << 2)
#define DPLANE_INTF_HAS_DEST DPLANE_INTF_CONNECTED #define DPLANE_INTF_HAS_DEST DPLANE_INTF_CONNECTED
#define DPLANE_INTF_HAS_LABEL (1 << 4) #define DPLANE_INTF_HAS_LABEL (1 << 4)
#define DPLANE_INTF_NOPREFIXROUTE (1 << 5)
/* Interface address/prefix */ /* Interface address/prefix */
struct prefix prefix; struct prefix prefix;
@ -2542,13 +2541,6 @@ bool dplane_ctx_intf_is_connected(const struct zebra_dplane_ctx *ctx)
return (ctx->u.intf.flags & DPLANE_INTF_CONNECTED); return (ctx->u.intf.flags & DPLANE_INTF_CONNECTED);
} }
bool dplane_ctx_intf_is_noprefixroute(const struct zebra_dplane_ctx *ctx)
{
DPLANE_CTX_VALID(ctx);
return (ctx->u.intf.flags & DPLANE_INTF_NOPREFIXROUTE);
}
bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx) bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx)
{ {
DPLANE_CTX_VALID(ctx); DPLANE_CTX_VALID(ctx);
@ -2577,13 +2569,6 @@ void dplane_ctx_intf_set_secondary(struct zebra_dplane_ctx *ctx)
ctx->u.intf.flags |= DPLANE_INTF_SECONDARY; ctx->u.intf.flags |= DPLANE_INTF_SECONDARY;
} }
void dplane_ctx_intf_set_noprefixroute(struct zebra_dplane_ctx *ctx)
{
DPLANE_CTX_VALID(ctx);
ctx->u.intf.flags |= DPLANE_INTF_NOPREFIXROUTE;
}
void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx) void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx)
{ {
DPLANE_CTX_VALID(ctx); DPLANE_CTX_VALID(ctx);

2
zebra/zebra_dplane.h
View File

@ -658,8 +658,6 @@ bool dplane_ctx_intf_is_connected(const struct zebra_dplane_ctx *ctx);
void dplane_ctx_intf_set_connected(struct zebra_dplane_ctx *ctx); void dplane_ctx_intf_set_connected(struct zebra_dplane_ctx *ctx);
bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx); bool dplane_ctx_intf_is_secondary(const struct zebra_dplane_ctx *ctx);
void dplane_ctx_intf_set_secondary(struct zebra_dplane_ctx *ctx); void dplane_ctx_intf_set_secondary(struct zebra_dplane_ctx *ctx);
bool dplane_ctx_intf_is_noprefixroute(const struct zebra_dplane_ctx *ctx);
void dplane_ctx_intf_set_noprefixroute(struct zebra_dplane_ctx *ctx);
bool dplane_ctx_intf_is_broadcast(const struct zebra_dplane_ctx *ctx); bool dplane_ctx_intf_is_broadcast(const struct zebra_dplane_ctx *ctx);
void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx); void dplane_ctx_intf_set_broadcast(struct zebra_dplane_ctx *ctx);
const struct prefix *dplane_ctx_get_intf_addr( const struct prefix *dplane_ctx_get_intf_addr(