From c5e2cb11ad79a7e3e7d0f8be391d1e9ab067b8da Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 10 Mar 2017 15:51:36 -0500 Subject: [PATCH] lib, pimd, zebra: Convert if_lookup_exact_address to VRF only Signed-off-by: Donald Sharp --- lib/if.c | 8 +------- lib/if.h | 3 +-- pimd/pim_rp.c | 2 +- ripd/rip_snmp.c | 2 +- zebra/zebra_routemap.c | 8 ++++---- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/lib/if.c b/lib/if.c index 8b10c91b94..14c333a4e7 100644 --- 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 10740957b5..6be1d4b891 100644 --- 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 dc19002a42..5155354625 100644 --- 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 c28b9379cc..fede5bed07 100644 --- 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 5fe4a7ab9d..6b81f66a26 100644 --- 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; -- 2.39.5