From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 3 Nov 2016 17:51:18 +0000 (-0400)
Subject: pimd: No need to reset uptime if state is the same
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~133
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e5b6b229976e3ac9dc8f019337acf21391e7cf2f;p=mirror%2Ffrr.git

pimd: No need to reset uptime if state is the same

Do not reset the time the mroute has been in it's
current state if we get a transition to the same state.

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

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index a070e92e45..3d592460dc 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -452,7 +452,8 @@ pim_upstream_switch(struct pim_upstream *up,
     case PIM_UPSTREAM_NOTJOINED:
     case PIM_UPSTREAM_JOINED:
       up->join_state       = new_state;
-      up->state_transition = pim_time_monotonic_sec();
+      if (old_state != new_state)
+        up->state_transition = pim_time_monotonic_sec();
 
       break;
     }