proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-26 06:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4321 from sworleys/Ribsystem-Ribkernel

Browse Source 
zebra: Make RIB_SYSTEM|KERNEL_ROUTE a property of rib.h
This commit is contained in:
Mark Stapp 2019-05-14 09:29:08 -04:00 committed by GitHub
commit 98124e2d6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zebra/rib.h
View File

@ -148,6 +148,10 @@ struct route_entry {
uint32_t dplane_sequence;
};
#define RIB_SYSTEM_ROUTE(R) RSYSTEM_ROUTE((R)->type)
#define RIB_KERNEL_ROUTE(R) RKERNEL_ROUTE((R)->type)
/* meta-queue structure:
* sub-queue 0: connected, kernel
* sub-queue 1: static

6
zebra/rt.h
View File

@ -35,8 +35,10 @@
extern "C" {
#endif
#define RSYSTEM_ROUTE(type) \
((type) == ZEBRA_ROUTE_KERNEL || (type) == ZEBRA_ROUTE_CONNECT)
#define RKERNEL_ROUTE(type) ((type) == ZEBRA_ROUTE_KERNEL)
#define RSYSTEM_ROUTE(type) \
((RKERNEL_ROUTE(type)) || (type) == ZEBRA_ROUTE_CONNECT)
/*
* Update or delete a route, LSP, or pseudowire from the kernel,

6
zebra/zebra_rib.c
View File

@ -797,12 +797,6 @@ struct route_entry *rib_lookup_ipv4(struct prefix_ipv4 *p, vrf_id_t vrf_id)
return NULL;
}
#define RIB_SYSTEM_ROUTE(R) \
((R)->type == ZEBRA_ROUTE_KERNEL || (R)->type == ZEBRA_ROUTE_CONNECT)
#define RIB_KERNEL_ROUTE(R) \
((R)->type == ZEBRA_ROUTE_KERNEL)
/* This function verifies reachability of one given nexthop, which can be
* numbered or unnumbered, IPv4 or IPv6. The result is unconditionally stored
* in nexthop->flags field. The nexthop->ifindex will be updated