]> git.puffer.fish Git - matthieu/frr.git/commitdiff
zebra: fix display of static routes pointing to nonexistent interfaces
authorRenato Westphal <renato@opensourcerouting.org>
Tue, 22 Aug 2017 13:52:07 +0000 (10:52 -0300)
committerRenato Westphal <renato@opensourcerouting.org>
Tue, 22 Aug 2017 13:52:07 +0000 (10:52 -0300)
Bug introduced a couple of weeks ago by myself. Only happens when the
route has an IP nexthop + a nexthop interface.

Example:
debian(config)# ip route 10.0.1.0/24 172.16.1.10 fake1
debian(config)# do sh run
Building configuration...
[snip]
!
ip route 10.0.1.0/24 172.16.1.10 unknown
!
end

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
zebra/zebra_vty.c

index f01f037ed5f3dc0b8676742958ae5f8ecb2de831..9f887e840189428045cfb4d16fd7cd34a3556571 100644 (file)
@@ -1705,16 +1705,14 @@ static int static_config(struct vty *vty, afi_t afi, safi_t safi,
                                                inet_ntop(AF_INET,
                                                          &si->addr.ipv4, buf,
                                                          sizeof buf),
-                                               ifindex2ifname(si->ifindex,
-                                                              si->vrf_id));
+                                               si->ifname);
                                        break;
                                case STATIC_IPV6_GATEWAY_IFNAME:
                                        vty_out(vty, " %s %s",
                                                inet_ntop(AF_INET6,
                                                          &si->addr.ipv6, buf,
                                                          sizeof buf),
-                                               ifindex2ifname(si->ifindex,
-                                                              si->vrf_id));
+                                               si->ifname);
                                        break;
                                }