:* Convert prefix2str to %pFX

[mirror_frr.git] / zebra / connected.c

diff --git a/zebra/connected.c b/zebra/connected.c
index 3b9ebe14a4c743cedeca66229caeb6eff94543a4..cd42b5b250599797757e38d02120aa2753294455 100644 (file)
--- a/zebra/connected.c
+++ b/zebra/connected.c
@@ -259,14 +259,10 @@ void connected_up(struct interface *ifp, struct connected *ifc)
 
        /* Schedule LSP forwarding entries for processing, if appropriate. */
        if (zvrf->vrf->vrf_id == VRF_DEFAULT) {
-               if (IS_ZEBRA_DEBUG_MPLS) {
-                       char buf[PREFIX_STRLEN];
-
+               if (IS_ZEBRA_DEBUG_MPLS)
                        zlog_debug(
-                               "%u: IF %s IP %s address add/up, scheduling MPLS processing",
-                               zvrf->vrf->vrf_id, ifp->name,
-                               prefix2str(&p, buf, sizeof(buf)));
-               }
+                               "%u: IF %s IP %pFX address add/up, scheduling MPLS processing",
+                               zvrf->vrf->vrf_id, ifp->name, &p);
                mpls_mark_lsps_for_processing(zvrf, &p);
        }
 }
@@ -393,21 +389,17 @@ void connected_down(struct interface *ifp, struct connected *ifc)
         * head.
         */
        rib_delete(afi, SAFI_UNICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT, 0,
-                  0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false);
+                  0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false, true);
 
        rib_delete(afi, SAFI_MULTICAST, zvrf->vrf->vrf_id, ZEBRA_ROUTE_CONNECT,
-                  0, 0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false);
+                  0, 0, &p, NULL, &nh, 0, zvrf->table_id, 0, 0, false, true);
 
        /* Schedule LSP forwarding entries for processing, if appropriate. */
        if (zvrf->vrf->vrf_id == VRF_DEFAULT) {
-               if (IS_ZEBRA_DEBUG_MPLS) {
-                       char buf[PREFIX_STRLEN];
-
+               if (IS_ZEBRA_DEBUG_MPLS)
                        zlog_debug(
-                               "%u: IF %s IP %s address down, scheduling MPLS processing",
-                               zvrf->vrf->vrf_id, ifp->name,
-                               prefix2str(&p, buf, sizeof(buf)));
-               }
+                               "%u: IF %s IP %pFX address down, scheduling MPLS processing",
+                               zvrf->vrf->vrf_id, ifp->name, &p);
                mpls_mark_lsps_for_processing(zvrf, &p);
        }
 }
@@ -424,14 +416,10 @@ static void connected_delete_helper(struct connected *ifc, struct prefix *p)
 
        /* Schedule LSP forwarding entries for processing, if appropriate. */
        if (ifp->vrf_id == VRF_DEFAULT) {
-               if (IS_ZEBRA_DEBUG_MPLS) {
-                       char buf[PREFIX_STRLEN];
-
+               if (IS_ZEBRA_DEBUG_MPLS)
                        zlog_debug(
-                               "%u: IF %s IP %s address delete, scheduling MPLS processing",
-                               ifp->vrf_id, ifp->name,
-                               prefix2str(p, buf, sizeof(buf)));
-               }
+                               "%u: IF %s IP %pFX address delete, scheduling MPLS processing",
+                               ifp->vrf_id, ifp->name, p);
                mpls_mark_lsps_for_processing(vrf_info_lookup(ifp->vrf_id), p);
        }
 }