]> git.puffer.fish Git - matthieu/frr.git/commitdiff
pim6d: creating pim6reg interface for pim6d
authorSarita Patra <saritap@vmware.com>
Wed, 8 Jun 2022 07:50:48 +0000 (00:50 -0700)
committerSarita Patra <saritap@vmware.com>
Wed, 15 Jun 2022 13:10:47 +0000 (06:10 -0700)
Signed-off-by: Sarita Patra <saritap@vmware.com>
pimd/pim_iface.c

index 65889fd57bc9357b0f6714871f5111658cfc9f23..95a5bb6032534c348f700e407682a61fcfa0e837 100644 (file)
@@ -1546,9 +1546,9 @@ void pim_if_create_pimreg(struct pim_instance *pim)
 
        if (!pim->regiface) {
                if (pim->vrf->vrf_id == VRF_DEFAULT)
-                       strlcpy(pimreg_name, "pimreg", sizeof(pimreg_name));
+                       strlcpy(pimreg_name, PIMREG, sizeof(pimreg_name));
                else
-                       snprintf(pimreg_name, sizeof(pimreg_name), "pimreg%u",
+                       snprintf(pimreg_name, sizeof(pimreg_name), PIMREG "%u",
                                 pim->vrf->data.l.table_id);
 
                pim->regiface = if_get_by_name(pimreg_name, pim->vrf->vrf_id,
@@ -1718,7 +1718,7 @@ static int pim_ifp_up(struct interface *ifp)
         * If we have a pimreg device callback and it's for a specific
         * table set the master appropriately
         */
-       if (sscanf(ifp->name, "pimreg%" SCNu32, &table_id) == 1) {
+       if (sscanf(ifp->name, "" PIMREG "%" SCNu32, &table_id) == 1) {
                struct vrf *vrf;
                RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
                        if ((table_id == vrf->data.l.table_id)