2003-06-19 Vladimir Ivaschenko <hazard@francoudi.com>
* zebra/rt_netlink.c: Debug statements added to
netlink_route_multipath()
* zebra/zebra_rib.c: If route has a gateway, delete only existing
route with that specified gateway.
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 2209364..09d2da5 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1146,6 +1146,13 @@
/* Apply mask. */
apply_mask_ipv4 (p);
+ if (IS_ZEBRA_DEBUG_KERNEL && gate)
+ zlog_info ("rib_delete_ipv4(): route delete %s/%d via %s ifindex %d",
+ inet_ntop (AF_INET, &p->prefix, buf1, BUFSIZ),
+ p->prefixlen,
+ inet_ntoa (*gate),
+ ifindex);
+
/* Lookup route node. */
rn = route_node_lookup (table, (struct prefix *) p);
if (! rn)
@@ -1192,6 +1199,20 @@
break;
}
}
+ else if (gate)
+ {
+ nexthop = rib->nexthop;
+
+ /* Make sure that the route found has the same gateway. */
+ if (rib->type == type
+ && nexthop &&
+ (IPV4_ADDR_SAME (&nexthop->gate.ipv4, gate) ||
+ IPV4_ADDR_SAME (&nexthop->rgate.ipv4, gate)) )
+ {
+ same = rib;
+ break;
+ }
+ }
else
{
if (rib->type == type)