diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-06 15:35:25 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-05-06 15:35:25 -0700 |
| commit | 1770a6f33b38776c319321d84981865481bb7b20 (patch) | |
| tree | de37f1d68a990bfab267eb4ae5df1ec97296bb8e /zebra/zebra_rib.c | |
| parent | 9a32fcb854b7eb222292ebfd080b48636482d15b (diff) | |
| parent | e305f18c5fd971d8ee6ffb19d6eefc620bcf7d31 (diff) | |
| download | quagga-1770a6f33b38776c319321d84981865481bb7b20.tar.bz2 quagga-1770a6f33b38776c319321d84981865481bb7b20.tar.xz | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-quagga into jenner
Diffstat (limited to 'zebra/zebra_rib.c')
| -rw-r--r-- | zebra/zebra_rib.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index d4395db1..5ea93112 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -2013,6 +2013,13 @@ rib_delete_ipv4 (int type, int flags, struct prefix_ipv4 *p, inet_ntoa (*gate), ifindex); + if (IS_ZEBRA_DEBUG_KERNEL && !gate) + zlog_debug ("rib_delete_ipv4(): route delete %s/%d directly, %s ifindex %d", + inet_ntop (AF_INET, &p->prefix, buf1, BUFSIZ), + p->prefixlen, + ifindex2ifname(ifindex), + ifindex); + /* Lookup route node. */ rn = route_node_lookup (table, (struct prefix *) p); if (! rn) @@ -2059,7 +2066,7 @@ rib_delete_ipv4 (int type, int flags, struct prefix_ipv4 *p, break; } /* Make sure that the route found has the same gateway. */ - else if (gate == NULL || + else if (gate != NULL && ((nexthop = rib->nexthop) && (IPV4_ADDR_SAME (&nexthop->gate.ipv4, gate) || IPV4_ADDR_SAME (&nexthop->rgate.ipv4, gate)))) |