lib, pimd, zebra: Convert if_lookup_exact_address to VRF only

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/lib/if.c b/lib/if.c
index 8b10c91b94c901f803240d233947088d2d4f441e..14c333a4e79004b5b788101bfbb75743072e46cc 100644 (file)
--- a/lib/if.c
+++ b/lib/if.c
@@ -339,7 +339,7 @@ if_lookup_by_name_len(const char *name, size_t namelen)
 
 /* Lookup interface by IPv4 address. */
 struct interface *
-if_lookup_exact_address_vrf (void *src, int family, vrf_id_t vrf_id)
+if_lookup_exact_address (void *src, int family, vrf_id_t vrf_id)
 {
   struct listnode *node;
   struct listnode *cnode;
@@ -371,12 +371,6 @@ if_lookup_exact_address_vrf (void *src, int family, vrf_id_t vrf_id)
   return NULL;
 }
 
-struct interface *
-if_lookup_exact_address (void *src, int family)
-{
-  return if_lookup_exact_address_vrf (src, family, VRF_DEFAULT);
-}
-
 /* Lookup interface by IPv4 address. */
 struct connected *
 if_lookup_address_vrf (void *matchaddr, int family, vrf_id_t vrf_id)

diff --git a/lib/if.h b/lib/if.h
index 10740957b5a2bb0108ad9d8c13965afa39e34e87..6be1d4b891676099ff333eaecebda3b142776dc4 100644 (file)
--- a/lib/if.h
+++ b/lib/if.h
@@ -389,7 +389,6 @@ struct nbr_connected
 
 /* Prototypes. */
 extern int if_cmp_name_func (char *, char *);
-extern struct interface *if_lookup_exact_address (void *matchaddr, int family);
 extern struct connected *if_lookup_address (void *matchaddr, int family);
 extern struct interface *if_lookup_prefix (struct prefix *prefix);
 
@@ -398,7 +397,7 @@ extern void if_update_vrf (struct interface *, const char *name, int namelen,
 extern struct interface *if_create (const char *name, int namelen,
                                     vrf_id_t vrf_id);
 extern struct interface *if_lookup_by_index (ifindex_t, vrf_id_t vrf_id);
-extern struct interface *if_lookup_exact_address_vrf (void *matchaddr, int family,
+extern struct interface *if_lookup_exact_address (void *matchaddr, int family,
                                 vrf_id_t vrf_id);
 extern struct connected *if_lookup_address_vrf (void *matchaddr, int family,
                                 vrf_id_t vrf_id);

diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index dc19002a4285cae0f8abef3b914a2604969b4a0c..5155354625392aebc7635cb01e70a0c5b46a598d 100644 (file)
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -752,7 +752,7 @@ pim_rp_check_is_my_ip_address (struct in_addr group, struct in_addr dest_addr)
        return 1;
     }
 
-  if (if_lookup_exact_address (&dest_addr, AF_INET))
+  if (if_lookup_exact_address (&dest_addr, AF_INET, VRF_DEFAULT))
     return 1;
     
   return 0;

diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c
index c28b9379ccb864d5584a8c36271f7c70d6cda105..fede5bed078417f16b79625b8edec1b935c82ca4 100644 (file)
--- a/ripd/rip_snmp.c
+++ b/ripd/rip_snmp.c
@@ -255,7 +255,7 @@ rip2IfLookup (struct variable *v, oid name[], size_t *length,
 
       oid2in_addr (name + v->namelen, sizeof (struct in_addr), addr);
 
-      return if_lookup_exact_address ((void *)addr, AF_INET);
+      return if_lookup_exact_address ((void *)addr, AF_INET, VRF_DEFAULT);
     }
   else
     {

diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index 5fe4a7ab9d9216be5217acc39d1b7b38061490ce..6b81f66a26e7bff4521bbe86b6d491a258289d18 100644 (file)
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -375,11 +375,11 @@ DEFUN (set_src,
   RB_FOREACH (vrf, vrf_id_head, &vrfs_by_id)
     {
       if (family == AF_INET)
-        pif = if_lookup_exact_address_vrf ((void *)&src.ipv4, AF_INET,
-                                           vrf->vrf_id);
+        pif = if_lookup_exact_address ((void *)&src.ipv4, AF_INET,
+                                       vrf->vrf_id);
       else if (family == AF_INET6)
-        pif = if_lookup_exact_address_vrf ((void *)&src.ipv6, AF_INET6,
-                                           vrf->vrf_id);
+        pif = if_lookup_exact_address ((void *)&src.ipv6, AF_INET6,
+                                       vrf->vrf_id);
 
       if (pif != NULL)
         break;