]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: lookup nh using vrf_id we checked before 5560/head
authorStephen Worley <sworley@cumulusnetworks.com>
Mon, 16 Dec 2019 22:40:41 +0000 (17:40 -0500)
committerStephen Worley <sworley@cumulusnetworks.com>
Wed, 8 Jan 2020 17:22:30 +0000 (12:22 -0500)
Update zclient_lookup_nexthop_once() to create the zapi
header using the vrf_id on the pim->vrf struct.

This is the one we do a check on a couple lines before, so
we should be using it when we actually create the header as
well.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
pimd/pim_zlookup.c

index 13b6fdf22f172aae165eabd68cdcad826a77dec9..0454c0d69ebe2a64f2d3bbe245a5adade75434ec 100644 (file)
@@ -346,7 +346,8 @@ static int zclient_lookup_nexthop_once(struct pim_instance *pim,
 
        s = zlookup->obuf;
        stream_reset(s);
-       zclient_create_header(s, ZEBRA_IPV4_NEXTHOP_LOOKUP_MRIB, pim->vrf_id);
+       zclient_create_header(s, ZEBRA_IPV4_NEXTHOP_LOOKUP_MRIB,
+                             pim->vrf->vrf_id);
        stream_put_in_addr(s, &addr);
        stream_putw_at(s, 0, stream_get_endp(s));