diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-07-24 11:49:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 11:49:49 -0400 |
| commit | 3f95d922580635804ef11f019dd7fb888ef20060 (patch) | |
| tree | bea784720dcbca8a33779c1a278ccc0a1426d1ad /zebra/zebra_rib.c | |
| parent | 79d702c130856b32509394d712cfdb7acb27ee5c (diff) | |
| parent | 1f610a1fb33468009b072e3793643a23b32bc720 (diff) | |
Merge pull request #2707 from opensourcerouting/fix-srcdest-netlink-read
zebra: do not ignore ipv6 srcdest routes
Diffstat (limited to 'zebra/zebra_rib.c')
| -rw-r--r-- | zebra/zebra_rib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index 9bf6bfa22f..71d48632c1 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -2331,7 +2331,7 @@ int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *p, if (!re) return 0; - assert(!src_p || afi == AFI_IP6); + assert(!src_p || !src_p->prefixlen || afi == AFI_IP6); /* Lookup table. */ table = zebra_vrf_table_with_table_id(afi, safi, re->vrf_id, re->table); @@ -2421,7 +2421,7 @@ void rib_delete(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, char buf2[INET6_ADDRSTRLEN]; rib_dest_t *dest; - assert(!src_p || afi == AFI_IP6); + assert(!src_p || !src_p->prefixlen || afi == AFI_IP6); /* Lookup table. */ table = zebra_vrf_table_with_table_id(afi, safi, vrf_id, table_id); |