diff options
Diffstat (limited to 'zebra/connected.c')
| -rw-r--r-- | zebra/connected.c | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/zebra/connected.c b/zebra/connected.c index e28ec8d09b..94b56c8971 100644 --- a/zebra/connected.c +++ b/zebra/connected.c @@ -73,7 +73,8 @@ static void connected_announce(struct interface *ifp, struct connected *ifc) if (!ifc) return; - if (!if_is_loopback(ifp) && ifc->address->family == AF_INET) { + if (!if_is_loopback(ifp) && ifc->address->family == AF_INET && + !IS_ZEBRA_IF_VRF(ifp)) { if (ifc->address->prefixlen == 32) SET_FLAG(ifc->flags, ZEBRA_IFA_UNNUMBERED); else @@ -249,9 +250,10 @@ void connected_up(struct interface *ifp, struct connected *ifc) if (IS_ZEBRA_DEBUG_RIB_DETAILED) { char buf[PREFIX_STRLEN]; - zlog_debug("%u: IF %s address %s add/up, scheduling RIB processing", - ifp->vrf_id, ifp->name, - prefix2str(&p, buf, sizeof(buf))); + zlog_debug( + "%u: IF %s address %s add/up, scheduling RIB processing", + ifp->vrf_id, ifp->name, + prefix2str(&p, buf, sizeof(buf))); } rib_update(ifp->vrf_id, RIB_UPDATE_IF_CHANGE); @@ -260,9 +262,10 @@ void connected_up(struct interface *ifp, struct connected *ifc) if (IS_ZEBRA_DEBUG_MPLS) { char buf[PREFIX_STRLEN]; - zlog_debug("%u: IF %s IP %s address add/up, scheduling MPLS processing", - ifp->vrf_id, ifp->name, - prefix2str(&p, buf, sizeof(buf))); + zlog_debug( + "%u: IF %s IP %s address add/up, scheduling MPLS processing", + ifp->vrf_id, ifp->name, + prefix2str(&p, buf, sizeof(buf))); } mpls_mark_lsps_for_processing(vrf_info_lookup(ifp->vrf_id)); } @@ -402,15 +405,16 @@ void connected_down(struct interface *ifp, struct connected *ifc) rib_delete(afi, SAFI_UNICAST, ifp->vrf_id, ZEBRA_ROUTE_CONNECT, 0, 0, &p, NULL, &nh, 0, 0, false, NULL); - rib_delete(afi, SAFI_MULTICAST, ifp->vrf_id, ZEBRA_ROUTE_CONNECT, 0, - 0, &p, NULL, &nh, 0, 0, false, NULL); + rib_delete(afi, SAFI_MULTICAST, ifp->vrf_id, ZEBRA_ROUTE_CONNECT, 0, 0, + &p, NULL, &nh, 0, 0, false, NULL); if (IS_ZEBRA_DEBUG_RIB_DETAILED) { char buf[PREFIX_STRLEN]; - zlog_debug("%u: IF %s IP %s address down, scheduling RIB processing", - ifp->vrf_id, ifp->name, - prefix2str(&p, buf, sizeof(buf))); + zlog_debug( + "%u: IF %s IP %s address down, scheduling RIB processing", + ifp->vrf_id, ifp->name, + prefix2str(&p, buf, sizeof(buf))); } rib_update(ifp->vrf_id, RIB_UPDATE_IF_CHANGE); @@ -420,9 +424,10 @@ void connected_down(struct interface *ifp, struct connected *ifc) if (IS_ZEBRA_DEBUG_MPLS) { char buf[PREFIX_STRLEN]; - zlog_debug("%u: IF %s IP %s address down, scheduling MPLS processing", - ifp->vrf_id, ifp->name, - prefix2str(&p, buf, sizeof(buf))); + zlog_debug( + "%u: IF %s IP %s address down, scheduling MPLS processing", + ifp->vrf_id, ifp->name, + prefix2str(&p, buf, sizeof(buf))); } mpls_mark_lsps_for_processing(vrf_info_lookup(ifp->vrf_id)); } @@ -441,9 +446,10 @@ static void connected_delete_helper(struct connected *ifc, struct prefix *p) if (IS_ZEBRA_DEBUG_RIB_DETAILED) { char buf[PREFIX_STRLEN]; - zlog_debug("%u: IF %s IP %s address del, scheduling RIB processing", - ifp->vrf_id, ifp->name, - prefix2str(p, buf, sizeof(buf))); + zlog_debug( + "%u: IF %s IP %s address del, scheduling RIB processing", + ifp->vrf_id, ifp->name, + prefix2str(p, buf, sizeof(buf))); } rib_update(ifp->vrf_id, RIB_UPDATE_IF_CHANGE); @@ -452,9 +458,10 @@ static void connected_delete_helper(struct connected *ifc, struct prefix *p) if (IS_ZEBRA_DEBUG_MPLS) { char buf[PREFIX_STRLEN]; - zlog_debug("%u: IF %s IP %s address delete, scheduling MPLS processing", - ifp->vrf_id, ifp->name, - prefix2str(p, buf, sizeof(buf))); + zlog_debug( + "%u: IF %s IP %s address delete, scheduling MPLS processing", + ifp->vrf_id, ifp->name, + prefix2str(p, buf, sizeof(buf))); } mpls_mark_lsps_for_processing(vrf_info_lookup(ifp->vrf_id)); } |