diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-06-15 11:29:25 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-15 11:29:25 -0400 | 
| commit | 668bbbce51d5cc2ba50ef4057fd59d18f8404bcd (patch) | |
| tree | 250169f3be10a89588c0ee08c6783d9f217c423e /pimd/pim_iface.c | |
| parent | 677106de0144865e75720015e1efc0fb5bcc0d03 (diff) | |
| parent | ee1c4ba977c2a0a6d104ac3776733e537471df32 (diff) | |
Merge pull request #11355 from patrasar/pim6reg
pim6d: creating pim6reg
Diffstat (limited to 'pimd/pim_iface.c')
| -rw-r--r-- | pimd/pim_iface.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index fd1806e360..4e92a2c5dc 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -1547,9 +1547,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, @@ -1719,7 +1719,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)  | 
