diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-04 10:31:37 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-04 10:31:37 -0700 |
| commit | db08408462ac8afa1b95aec4eb8d3efeb283025d (patch) | |
| tree | ece8ff3df7fce16c95c4057f32346beae979dbd0 /ospfd/ospf_snmp.c | |
| parent | cd2ec99e4e365bd61deebd61639cd3e1e777cdbe (diff) | |
| parent | 6e0989e113d9e2268e58cfe29922e971793c1d06 (diff) | |
| download | quagga-db08408462ac8afa1b95aec4eb8d3efeb283025d.tar.bz2 quagga-db08408462ac8afa1b95aec4eb8d3efeb283025d.tar.xz | |
Merge branch 'upstream' into jenner
Conflicts:
bgpd/bgp_aspath.c
bgpd/bgpd.c
lib/smux.c
lib/workqueue.c
ospfd/ospf_snmp.c
Diffstat (limited to 'ospfd/ospf_snmp.c')
| -rw-r--r-- | ospfd/ospf_snmp.c | 24 |
1 files changed, 12 insertions, 12 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 |