diff options
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_snmp.c | 24 | ||||
| -rw-r--r-- | ospfd/ospf_vty.c | 4 |
2 files changed, 15 insertions, 13 deletions
diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c index 9c54860c..cc4974ce 100644 --- a/ospfd/ospf_snmp.c +++ b/ospfd/ospf_snmp.c @@ -1574,19 +1574,19 @@ ospf_snmp_if_lookup_next (struct in_addr *ifaddr, unsigned int *ifindex, /* Usual interface */ if (ifaddr->s_addr) { - /* The interface must have valid AF_INET connected address */ - /* it must have lager IPv4 address value than the lookup entry */ - if ((ospf_snmp_is_if_have_addr(osif->ifp)) && - (ntohl (osif->addr.s_addr) > ntohl (ifaddr->s_addr))) - { - *ifaddr = osif->addr; - *ifindex = osif->ifindex; + /* The interface must have valid AF_INET connected address */ + /* it must have lager IPv4 address value than the lookup entry */ + if ((ospf_snmp_is_if_have_addr(osif->ifp)) && + (ntohl (osif->addr.s_addr) > ntohl (ifaddr->s_addr))) + { + *ifaddr = osif->addr; + *ifindex = osif->ifindex; - /* and it must be an OSPF interface */ - oi = ospf_if_lookup_by_local_addr (ospf, osif->ifp, *ifaddr); - if (oi) - return oi; - } + /* and it must be an OSPF interface */ + oi = ospf_if_lookup_by_local_addr (ospf, osif->ifp, *ifaddr); + if (oi) + return oi; + } } /* Unnumbered interface */ else diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index e77d3807..fce22e5c 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -2115,8 +2115,10 @@ DEFUN (no_ospf_abr_type, abr_type = OSPF_ABR_CISCO; else if (strncmp (argv[0], "i", 1) == 0) abr_type = OSPF_ABR_IBM; - else if (strncmp (argv[0], "s", 1) == 0) + else if (strncmp (argv[0], "sh", 2) == 0) abr_type = OSPF_ABR_SHORTCUT; + else if (strncmp (argv[0], "st", 2) == 0) + abr_type = OSPF_ABR_STAND; else return CMD_WARNING; |