2003-05-24 Kenji Yabuuchi

        * ospf_interface.c(ospf_if_lookup_recv_if): Use the most specific
          match for interface lookup.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 1109eb0a9ed9e7eda8ed73ddc7733a94195c3a27..7720adccf1db8dcf17cd8b966593e478f7115371 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-24 Kenji Yabuuchi
+
+       * ospf_interface.c(ospf_if_lookup_recv_if): Use the most specific
+         match for interface lookup.
+
 2003-05-18 Hasso Tepper <hasso@estpak.ee>
 
        * ospf_vty.c: Show NSSA LSA route info in "show ip ospf database"

diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index c37e194858367c2c6730554255f864e1f50edf18..569e4781412b3fc932e7a84d62c4746c890cbafd 100644 (file)
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -425,7 +425,11 @@ ospf_if_lookup_recv_if (struct ospf *ospf, struct in_addr src)
       else
        {
          if (prefix_match (oi->address, (struct prefix *) &addr))
-           match = oi;
+           {
+             if (match == NULL || 
+                (match->address->prefixlen < oi->address->prefixlen)
+               match = oi;
+           }
        }
     }