]> git.proxmox.com Git - mirror_frr.git/commit - pimd/pim_ssm.c
pimd: Remove pim->vrf_id and use pim->vrf->vrf_id
authorDonald Sharp <sharpd@nvidia.com>
Wed, 12 May 2021 18:31:45 +0000 (14:31 -0400)
committerDonald Sharp <sharpd@nvidia.com>
Wed, 12 May 2021 18:36:59 +0000 (14:36 -0400)
commitd3cc1e45182196a0b9b7146bcbaef04f346d9721
tree2841feca90eae72f58a1c0c3e23af860db3f3b46
parente5981db7e9eda027c189d3d528f7e02c05faf29a
pimd: Remove pim->vrf_id and use pim->vrf->vrf_id

VRF creation can happen from either cli or from
knowledged about the vrf learned from zebra.
In the case where we learn about the vrf from
the cli, the vrf id is UNKNOWN.  Upon actual
creation of the vrf, lib/vrf.c touches up the vrf_id
and calls pim_vrf_enable to turn it on properly.
At this point in time we have a pim->vrf_id of
UNKNOWN and the vrf->vrf_id of the right value.

There is no point in duplicating this data.  So just
remove all pim->vrf_id and use the vrf->vrf_id instead
since we keep a copy of the pim->vrf pointer.

This will remove some crashes where we expect the
pim->vrf_id to be usable and it's not.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
18 files changed:
pimd/pim_bsm.c
pimd/pim_cmd.c
pimd/pim_iface.c
pimd/pim_igmp_mtrace.c
pimd/pim_instance.c
pimd/pim_instance.h
pimd/pim_mroute.c
pimd/pim_msdp_socket.c
pimd/pim_nb_config.c
pimd/pim_nht.c
pimd/pim_pim.c
pimd/pim_rp.c
pimd/pim_rpf.c
pimd/pim_ssm.c
pimd/pim_ssmpingd.c
pimd/pim_vty.c
pimd/pim_vxlan.c
pimd/pim_zlookup.c