diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-04 12:41:54 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-04 15:39:21 +0200 |
| commit | 702c04fbef222e802ca4dfac645dc75ede522db6 (patch) | |
| tree | cf962b4003b0e7115ab230924cbdb0775a7cba45 /nest | |
| parent | 0c4e0e4a635169cada395144dd67d1e66f1c9649 (diff) | |
Removing the route scope attribute. Use custom attributes instead.
The route scope attribute was used for simple user route marking. As
there is a better tool for this (custom attributes), the old and limited
way can be dropped.
Diffstat (limited to 'nest')
| -rw-r--r-- | nest/rt-attr.c | 8 | ||||
| -rw-r--r-- | nest/rt-dev.c | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/nest/rt-attr.c b/nest/rt-attr.c index 87f54b0d..a892bfd5 100644 --- a/nest/rt-attr.c +++ b/nest/rt-attr.c @@ -1235,7 +1235,6 @@ rta_hash(rta *a) #define BMIX(f) mem_hash_mix_num(&h, a->f); MIX(hostentry); BMIX(source); - BMIX(scope); BMIX(dest); #undef MIX @@ -1246,7 +1245,6 @@ static inline int rta_same(rta *x, rta *y) { return (x->source == y->source && - x->scope == y->scope && x->dest == y->dest && x->hostentry == y->hostentry && nexthop_same(&(x->nh), &(y->nh)) && @@ -1396,8 +1394,8 @@ rta_dump(rta *a) "RTS_OSPF_EXT2", "RTS_BGP", "RTS_PIPE", "RTS_BABEL" }; static char *rtd[] = { "", " DEV", " HOLE", " UNREACH", " PROHIBIT" }; - debug("uc=%d %s %s%s h=%04x", - a->uc, rts[a->source], ip_scope_text(a->scope), + debug("uc=%d %s %s h=%04x", + a->uc, rts[a->source], rtd[a->dest], a->hash_key); if (!a->cached) debug(" !CACHED"); @@ -1443,7 +1441,7 @@ rta_dump_all(void) void rta_show(struct cli *c, rta *a) { - cli_printf(c, -1008, "\tType: %s %s", rta_src_names[a->source], ip_scope_text(a->scope)); + cli_printf(c, -1008, "\tType: %s", rta_src_names[a->source]); for(ea_list *eal = a->eattrs; eal; eal=eal->next) for(int i=0; i<eal->count; i++) diff --git a/nest/rt-dev.c b/nest/rt-dev.c index 696b37b8..ffd5afd5 100644 --- a/nest/rt-dev.c +++ b/nest/rt-dev.c @@ -84,7 +84,6 @@ dev_ifa_notify(struct proto *P, uint flags, struct ifa *ad) rta a0 = { .source = RTS_DEVICE, - .scope = SCOPE_UNIVERSE, .dest = RTD_UNICAST, .nh.iface = ad->iface, }; |