mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 17:51:53 +00:00
Code Releases Activity

Cleaning up also the rte_same hook which is never set

Browse Source
This commit is contained in:
Maria Matejka 2020-02-17 12:55:11 +01:00
parent f2918e20ea
commit 6cbeefc2ac
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nest/proto-hooks.c
View File

@ -274,21 +274,6 @@ int rte_recalculate(struct rtable *table, struct network *net, struct rte *new,
int rte_better(rte *new, rte *old) int rte_better(rte *new, rte *old)
{ DUMMY; } { DUMMY; }
/**
* rte_same - compare two routes
* @e1: route
* @e2: route
*
* The rte_same() hook tests whether the routes @e1 and @e2 belonging
* to the same protocol instance have identical contents. Contents of
* &rta, all the extended attributes and &rte preference are checked
* by the core code, no need to take care of them here.
*
* Result: 1 if @e1 is identical to @e2, 0 otherwise.
*/
int rte_same(rte *e1, rte *e2)
{ DUMMY; }
/** /**
* rte_insert - notify instance about route insertion * rte_insert - notify instance about route insertion
* @n: network * @n: network

2
nest/protocol.h
View File

@ -222,7 +222,6 @@ struct proto {
* *
* rte_recalculate Called at the beginning of the best route selection * rte_recalculate Called at the beginning of the best route selection
* rte_better Compare two rte's and decide which one is better (1=first, 0=second). * rte_better Compare two rte's and decide which one is better (1=first, 0=second).
* rte_same Compare two rte's and decide whether they are identical (1=yes, 0=no).
* rte_mergable Compare two rte's and decide whether they could be merged (1=yes, 0=no). * rte_mergable Compare two rte's and decide whether they could be merged (1=yes, 0=no).
* rte_insert Called whenever a rte is inserted to a routing table. * rte_insert Called whenever a rte is inserted to a routing table.
* rte_remove Called whenever a rte is removed from the routing table. * rte_remove Called whenever a rte is removed from the routing table.
@ -230,7 +229,6 @@ struct proto {
int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *); int (*rte_recalculate)(struct rtable *, struct network *, struct rte *, struct rte *, struct rte *);
int (*rte_better)(struct rte *, struct rte *); int (*rte_better)(struct rte *, struct rte *);
int (*rte_same)(struct rte *, struct rte *);
int (*rte_mergable)(struct rte *, struct rte *); int (*rte_mergable)(struct rte *, struct rte *);
struct rte * (*rte_modify)(struct rte *, struct linpool *); struct rte * (*rte_modify)(struct rte *, struct linpool *);
void (*rte_insert)(struct network *, struct rte *); void (*rte_insert)(struct network *, struct rte *);

2
nest/rt-table.c
View File

@ -902,8 +902,6 @@ rte_same(rte *x, rte *y)
/* rte.flags are not checked, as they are mostly internal to rtable */ /* rte.flags are not checked, as they are mostly internal to rtable */
return return
x->attrs == y->attrs && x->attrs == y->attrs &&
x->pflags == y->pflags &&
(!x->attrs->src->proto->rte_same || x->attrs->src->proto->rte_same(x, y)) &&
rte_is_filtered(x) == rte_is_filtered(y); rte_is_filtered(x) == rte_is_filtered(y);
} }