summaryrefslogtreecommitdiffstats
path: root/ripd/rip_interface.c
diff options
context:
space:
mode:
Diffstat (limited to 'ripd/rip_interface.c')
-rw-r--r--ripd/rip_interface.c54
1 files changed, 21 insertions, 33 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 3d128ee72..8fd64f287 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -317,14 +317,12 @@ static int rip_ifp_down(struct interface *ifp)
rip_interface_sync(ifp);
rip_if_down(ifp);
- if (IS_RIP_DEBUG_ZEBRA) {
- struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
-
+ if (IS_RIP_DEBUG_ZEBRA)
zlog_debug(
"interface %s vrf %s(%u) index %d flags %llx metric %d mtu %d is down",
- ifp->name, VRF_LOGNAME(vrf), ifp->vrf_id, ifp->ifindex,
- (unsigned long long)ifp->flags, ifp->metric, ifp->mtu);
- }
+ ifp->name, ifp->vrf->name, ifp->vrf->vrf_id,
+ ifp->ifindex, (unsigned long long)ifp->flags,
+ ifp->metric, ifp->mtu);
return 0;
}
@@ -332,14 +330,12 @@ static int rip_ifp_down(struct interface *ifp)
/* Inteface link up message processing */
static int rip_ifp_up(struct interface *ifp)
{
- if (IS_RIP_DEBUG_ZEBRA) {
- struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
-
+ if (IS_RIP_DEBUG_ZEBRA)
zlog_debug(
"interface %s vrf %s(%u) index %d flags %#llx metric %d mtu %d is up",
- ifp->name, VRF_LOGNAME(vrf), ifp->vrf_id, ifp->ifindex,
- (unsigned long long)ifp->flags, ifp->metric, ifp->mtu);
- }
+ ifp->name, ifp->vrf->name, ifp->vrf->vrf_id,
+ ifp->ifindex, (unsigned long long)ifp->flags,
+ ifp->metric, ifp->mtu);
rip_interface_sync(ifp);
@@ -360,13 +356,12 @@ static int rip_ifp_create(struct interface *ifp)
{
rip_interface_sync(ifp);
- if (IS_RIP_DEBUG_ZEBRA) {
- struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
+ if (IS_RIP_DEBUG_ZEBRA)
zlog_debug(
"interface add %s vrf %s(%u) index %d flags %#llx metric %d mtu %d",
- ifp->name, VRF_LOGNAME(vrf), ifp->vrf_id, ifp->ifindex,
- (unsigned long long)ifp->flags, ifp->metric, ifp->mtu);
- }
+ ifp->name, ifp->vrf->name, ifp->vrf->vrf_id,
+ ifp->ifindex, (unsigned long long)ifp->flags,
+ ifp->metric, ifp->mtu);
/* Check if this interface is RIP enabled or not.*/
rip_enable_apply(ifp);
@@ -387,8 +382,6 @@ static int rip_ifp_create(struct interface *ifp)
static int rip_ifp_destroy(struct interface *ifp)
{
- struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id);
-
rip_interface_sync(ifp);
if (if_is_up(ifp)) {
rip_if_down(ifp);
@@ -397,8 +390,9 @@ static int rip_ifp_destroy(struct interface *ifp)
if (IS_RIP_DEBUG_ZEBRA)
zlog_debug(
"interface delete %s vrf %s(%u) index %d flags %#llx metric %d mtu %d",
- ifp->name, VRF_LOGNAME(vrf), ifp->vrf_id, ifp->ifindex,
- (unsigned long long)ifp->flags, ifp->metric, ifp->mtu);
+ ifp->name, ifp->vrf->name, ifp->vrf->vrf_id,
+ ifp->ifindex, (unsigned long long)ifp->flags,
+ ifp->metric, ifp->mtu);
return 0;
}
@@ -415,12 +409,11 @@ int rip_interface_vrf_update(ZAPI_CALLBACK_ARGS)
return 0;
if (IS_RIP_DEBUG_ZEBRA) {
- struct vrf *vrf = vrf_lookup_by_id(vrf_id);
struct vrf *nvrf = vrf_lookup_by_id(new_vrf_id);
zlog_debug("interface %s VRF change vrf %s(%u) new vrf %s(%u)",
- ifp->name, VRF_LOGNAME(vrf), vrf_id,
- VRF_LOGNAME(nvrf), new_vrf_id);
+ ifp->name, ifp->vrf->name, vrf_id, VRF_LOGNAME(nvrf),
+ new_vrf_id);
}
if_update_to_new_vrf(ifp, new_vrf_id);
@@ -1130,16 +1123,11 @@ int rip_show_network_config(struct vty *vty, struct rip *rip)
void rip_interface_sync(struct interface *ifp)
{
- struct vrf *vrf;
-
- vrf = vrf_lookup_by_id(ifp->vrf_id);
- if (vrf) {
- struct rip_interface *ri;
+ struct rip_interface *ri;
- ri = ifp->info;
- if (ri)
- ri->rip = vrf->info;
- }
+ ri = ifp->info;
+ if (ri)
+ ri->rip = ifp->vrf->info;
}
/* Called when interface structure allocated. */