mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-08 03:28:31 +00:00
Merge pull request #15309 from donaldsharp/reorg_route_entry
zebra: Reorg `struct route_entry` to have important bits first
This commit is contained in:
commit
3204cc1540
26
zebra/rib.h
26
zebra/rib.h
@ -85,25 +85,12 @@ struct route_entry {
|
|||||||
*/
|
*/
|
||||||
struct nhg_hash_entry *nhe;
|
struct nhg_hash_entry *nhe;
|
||||||
|
|
||||||
/* Nexthop group from FIB (optional), reflecting what is actually
|
|
||||||
* installed in the FIB if that differs. The 'backup' group is used
|
|
||||||
* when backup nexthops are present in the route's nhg.
|
|
||||||
*/
|
|
||||||
struct nexthop_group fib_ng;
|
|
||||||
struct nexthop_group fib_backup_ng;
|
|
||||||
|
|
||||||
/* Nexthop group hash entry IDs. The "installed" id is the id
|
/* Nexthop group hash entry IDs. The "installed" id is the id
|
||||||
* used in linux/netlink, if available.
|
* used in linux/netlink, if available.
|
||||||
*/
|
*/
|
||||||
uint32_t nhe_id;
|
uint32_t nhe_id;
|
||||||
uint32_t nhe_installed_id;
|
uint32_t nhe_installed_id;
|
||||||
|
|
||||||
/* Tag */
|
|
||||||
route_tag_t tag;
|
|
||||||
|
|
||||||
/* Uptime. */
|
|
||||||
time_t uptime;
|
|
||||||
|
|
||||||
/* Type of this route. */
|
/* Type of this route. */
|
||||||
int type;
|
int type;
|
||||||
|
|
||||||
@ -160,7 +147,20 @@ struct route_entry {
|
|||||||
/* Distance. */
|
/* Distance. */
|
||||||
uint8_t distance;
|
uint8_t distance;
|
||||||
|
|
||||||
|
/* Tag */
|
||||||
|
route_tag_t tag;
|
||||||
|
|
||||||
|
/* Uptime. */
|
||||||
|
time_t uptime;
|
||||||
|
|
||||||
struct re_opaque *opaque;
|
struct re_opaque *opaque;
|
||||||
|
|
||||||
|
/* Nexthop group from FIB (optional), reflecting what is actually
|
||||||
|
* installed in the FIB if that differs. The 'backup' group is used
|
||||||
|
* when backup nexthops are present in the route's nhg.
|
||||||
|
*/
|
||||||
|
struct nexthop_group fib_ng;
|
||||||
|
struct nexthop_group fib_backup_ng;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define RIB_SYSTEM_ROUTE(R) RSYSTEM_ROUTE((R)->type)
|
#define RIB_SYSTEM_ROUTE(R) RSYSTEM_ROUTE((R)->type)
|
||||||
|
Loading…
Reference in New Issue
Block a user