From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sun, 4 Dec 2016 19:41:20 +0000 (-0500)
Subject: zebra: LastUsed needs to be updated properly.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~37
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=113db9450ed4fda1e1c2925998f995f59d261fd7;p=mirror%2Ffrr.git

zebra: LastUsed needs to be updated properly.

The change to allow 12.04 to work killed S,G age out.

Put it back.

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

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 05a9940a93..2dc699a27e 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -79,6 +79,10 @@
 #define RTA_ENCAP	22
 #endif
 
+#ifndef RTA_EXPIRES
+#define RTA_EXPIRES     23
+#endif
+
 #ifndef LWTUNNEL_ENCAP_MPLS
 #define LWTUNNEL_ENCAP_MPLS  1
 #endif
@@ -566,10 +570,8 @@ netlink_route_change_read_multicast (struct sockaddr_nl *snl, struct nlmsghdr *h
   if (tb[RTA_DST])
     m->sg.grp = *(struct in_addr *)RTA_DATA (tb[RTA_DST]);
 
-#if defined RTA_EXPIRES
-  if (tb[RTA_EXPIRES])
+  if ((RTA_EXPIRES <= RTA_MAX) && tb[RTA_EXPIRES])
     m->lastused = *(unsigned long long *)RTA_DATA (tb[RTA_EXPIRES]);
-#endif
 
   if (tb[RTA_MULTIPATH])
     {