From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 23 Sep 2016 15:10:31 +0000 (-0400)
Subject: pimd: Track upstream state a bit better.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~204
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=16b7259142467de43856bd7dcfe2667611434af0;p=mirror%2Ffrr.git

pimd: Track upstream state a bit better.

Track the upstream state if we are adding
a new state to a pre-existing upstream.

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

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 027a4ca0c4..138843405b 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -569,6 +569,7 @@ struct pim_upstream *pim_upstream_add(struct prefix_sg *sg,
   up = pim_upstream_find(sg);
   if (up) {
     ++up->ref_count;
+    up->flags |= flags;
   }
   else {
     up = pim_upstream_new(sg, incoming, flags);