From 26a7da3637698a72f4091f9b8aa009dfafd4c98b Mon Sep 17 00:00:00 2001 From: Sarita Patra Date: Mon, 10 Oct 2022 11:06:10 -0700 Subject: [PATCH] zebra: Send nexthop ifindex for type NEXTHOP_TYPE_IPV6 Once RP/BSR address is learned in PIMD, PIMD does nexthop tracking in Zebra. For IPV6 address, the nexthop type is either NEXTHOP_TYPE_IPV6 or NEXTHOP_TYPE_IPV6_IFINDEX. Zebra should send nexthop ifindex information along with nexthop address to the client (PIMD). Issue: #11526 Issue: #11957 Signed-off-by: Sarita Patra (cherry picked from commit ed9323604af55590d81900af2d6953c9db565ab3) --- zebra/zapi_msg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index a2233a6667..c0945eae2d 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -134,8 +134,6 @@ static int zserv_encode_nexthop(struct stream *s, struct nexthop *nexthop) stream_putl(s, nexthop->ifindex); break; case NEXTHOP_TYPE_IPV6: - stream_put(s, &nexthop->gate.ipv6, 16); - break; case NEXTHOP_TYPE_IPV6_IFINDEX: stream_put(s, &nexthop->gate.ipv6, 16); stream_putl(s, nexthop->ifindex);