diff options
Diffstat (limited to 'ripngd/ripng_interface.c')
| -rw-r--r-- | ripngd/ripng_interface.c | 84 |
1 files changed, 22 insertions, 62 deletions
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c index 7b5e7604d2..a6d379fda4 100644 --- a/ripngd/ripng_interface.c +++ b/ripngd/ripng_interface.c @@ -201,14 +201,12 @@ static int ripng_if_down(struct interface *ifp) /* Inteface link up message processing. */ static int ripng_ifp_up(struct interface *ifp) { - if (IS_RIPNG_DEBUG_ZEBRA) { - struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id); - + if (IS_RIPNG_DEBUG_ZEBRA) zlog_debug( "interface up %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->mtu6); - } + ifp->name, ifp->vrf->name, ifp->vrf->vrf_id, + ifp->ifindex, (unsigned long long)ifp->flags, + ifp->metric, ifp->mtu6); ripng_interface_sync(ifp); @@ -230,14 +228,12 @@ static int ripng_ifp_down(struct interface *ifp) ripng_interface_sync(ifp); ripng_if_down(ifp); - if (IS_RIPNG_DEBUG_ZEBRA) { - struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id); - + if (IS_RIPNG_DEBUG_ZEBRA) zlog_debug( "interface down %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->mtu6); - } + ifp->name, ifp->vrf->name, ifp->vrf->vrf_id, + ifp->ifindex, (unsigned long long)ifp->flags, + ifp->metric, ifp->mtu6); return 0; } @@ -247,14 +243,12 @@ static int ripng_ifp_create(struct interface *ifp) { ripng_interface_sync(ifp); - if (IS_RIPNG_DEBUG_ZEBRA) { - struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id); - + if (IS_RIPNG_DEBUG_ZEBRA) zlog_debug( "RIPng 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->mtu6); - } + ifp->name, ifp->vrf->name, ifp->vrf->vrf_id, + ifp->ifindex, (unsigned long long)ifp->flags, + ifp->metric, ifp->mtu6); /* Check is this interface is RIP enabled or not.*/ ripng_enable_apply(ifp); @@ -270,8 +264,6 @@ static int ripng_ifp_create(struct interface *ifp) static int ripng_ifp_destroy(struct interface *ifp) { - struct vrf *vrf = vrf_lookup_by_id(ifp->vrf_id); - ripng_interface_sync(ifp); if (if_is_up(ifp)) { ripng_if_down(ifp); @@ -280,8 +272,9 @@ static int ripng_ifp_destroy(struct interface *ifp) if (IS_RIPNG_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->mtu6); + ifp->name, ifp->vrf->name, ifp->vrf->vrf_id, + ifp->ifindex, (unsigned long long)ifp->flags, + ifp->metric, ifp->mtu6); return 0; } @@ -298,12 +291,11 @@ int ripng_interface_vrf_update(ZAPI_CALLBACK_ARGS) return 0; if (IS_RIPNG_DEBUG_ZEBRA) { - struct vrf *vrf = vrf_lookup_by_id(ifp->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); @@ -896,16 +888,11 @@ static struct ripng_interface *ri_new(void) void ripng_interface_sync(struct interface *ifp) { - struct vrf *vrf; - - vrf = vrf_lookup_by_id(ifp->vrf_id); - if (vrf) { - struct ripng_interface *ri; + struct ripng_interface *ri; - ri = ifp->info; - if (ri) - ri->ripng = vrf->info; - } + ri = ifp->info; + if (ri) + ri->ripng = ifp->vrf->info; } static int ripng_if_new_hook(struct interface *ifp) @@ -923,33 +910,6 @@ static int ripng_if_delete_hook(struct interface *ifp) return 0; } -/* Configuration write function for ripngd. */ -static int interface_config_write(struct vty *vty) -{ - struct vrf *vrf; - int write = 0; - - RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) { - struct interface *ifp; - - FOR_ALL_INTERFACES (vrf, ifp) { - struct lyd_node *dnode; - - dnode = yang_dnode_getf( - running_config->dnode, - "/frr-interface:lib/interface[name='%s'][vrf='%s']", - ifp->name, vrf->name); - if (dnode == NULL) - continue; - - write = 1; - nb_cli_show_dnode_cmds(vty, dnode, false); - } - } - - return write; -} - /* Initialization of interface. */ void ripng_if_init(void) { @@ -958,7 +918,7 @@ void ripng_if_init(void) hook_register_prio(if_del, 0, ripng_if_delete_hook); /* Install interface node. */ - if_cmd_init(interface_config_write); + if_cmd_init_default(); if_zapi_callbacks(ripng_ifp_create, ripng_ifp_up, ripng_ifp_down, ripng_ifp_destroy); } |