From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sun, 21 May 2017 13:14:39 +0000 (-0400)
Subject: pimd: Make pim_hello choose correct vrf
X-Git-Tag: frr-4.0-dev~468^2~104
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=88a3f5e121fb9035ac4e669e2e8780ed233c70ac;p=mirror%2Ffrr.git

pimd: Make pim_hello choose correct vrf

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_hello.c b/pimd/pim_hello.c
index bfa57d7f9d..138a110d3a 100644
--- a/pimd/pim_hello.c
+++ b/pimd/pim_hello.c
@@ -446,6 +446,8 @@ int pim_hello_build_tlv(struct interface *ifp, uint8_t *tlv_buf,
 	uint8_t *curr = tlv_buf;
 	uint8_t *pastend = tlv_buf + tlv_buf_size;
 	uint8_t *tmp;
+	struct pim_interface *pim_ifp = ifp->info;
+	struct pim_instance *pim = pim_ifp->pim;
 
 	/*
 	 * Append options
@@ -517,7 +519,7 @@ int pim_hello_build_tlv(struct interface *ifp, uint8_t *tlv_buf,
 			}
 			return -4;
 		}
-		if (pimg->send_v6_secondary) {
+		if (pim->send_v6_secondary) {
 			curr = pim_tlv_append_addrlist_ucast(
 				curr, pastend, ifp->connected, AF_INET6);
 			if (!curr) {