From: Donald Sharp 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~83^2~1 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=40a678a4212dc4963f3d471bf831e65200417110;p=matthieu%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 --- diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 0fd29a5efc..913d1d5770 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -77,6 +77,10 @@ #define RTA_ENCAP 22 #endif +#ifndef RTA_EXPIRES +#define RTA_EXPIRES 23 +#endif + #ifndef LWTUNNEL_ENCAP_MPLS #define LWTUNNEL_ENCAP_MPLS 1 #endif @@ -552,7 +556,7 @@ netlink_route_change_read_multicast (struct sockaddr_nl *snl, struct nlmsghdr *h if (tb[RTA_DST]) sg.grp = *(struct in_addr *)RTA_DATA (tb[RTA_DST]); - if (tb[RTA_EXPIRES]) + if ((RTA_EXPIRES <= RTA_MAX) && tb[RTA_EXPIRES]) lastused = *(unsigned long long *)RTA_DATA (tb[RTA_EXPIRES]); if (tb[RTA_MULTIPATH])