* rip_routemap.c: Make "match interface" routemap command match both -

	  in and out interfaces.

	Fixes bugzilla #185. [backport candidate]

diff --git a/ripd/ChangeLog b/ripd/ChangeLog
index 7b47268a6352b15b632b9a8b6c4a3386ac77c877..9e787d075fa1501b4ee084256786b034d9037c3c 100644 (file)
--- a/ripd/ChangeLog
+++ b/ripd/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-26 Hasso Tepper <hasso at quagga.net>
+
+       * rip_routemap.c: Make "match interface" routemap command match both -
+         in and out interfaces.
+
 2005-05-11 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * rip_interface.c (rip_interface_add): Need to call

diff --git a/ripd/rip_routemap.c b/ripd/rip_routemap.c
index e9dae2a308f8eb8f8f1ace008b5b7074b3c14e1b..63d0ccce9b89b079843d0c837a881fc4f76d9692 100644 (file)
--- a/ripd/rip_routemap.c
+++ b/ripd/rip_routemap.c
@@ -228,7 +228,7 @@ route_match_interface (void *rule, struct prefix *prefix,
 
       rinfo = object;
 
-      if (rinfo->ifindex_out == ifp->ifindex)
+      if (rinfo->ifindex_out == ifp->ifindex || rinfo->ifindex == ifp->ifindex)
        return RMAP_MATCH;
       else
        return RMAP_NOMATCH;