[PATCH net] ipv6: allow routes to be configured with expire values
From: Xin Long <lucien.xin@gmail.com>
Date: 2015-11-04 13:08:14
Subsystem:
networking [general], networking [ipv4/ipv6], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Linus Torvalds
Add the support for adding expire value to routes, requested by Tom Gundersen [off-list ref] for systemd-networkd, and NetworkManager wants it too. add it by using the field rta_expires of rta_cacheinfo Signed-off-by: Xin Long <lucien.xin@gmail.com> Signed-off-by: Hannes Frederic Sowa <redacted> --- net/ipv6/route.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 946880a..49780bc 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c@@ -2700,6 +2700,7 @@ static const struct nla_policy rtm_ipv6_policy[RTA_MAX+1] = { [RTA_PREF] = { .type = NLA_U8 }, [RTA_ENCAP_TYPE] = { .type = NLA_U16 }, [RTA_ENCAP] = { .type = NLA_NESTED }, + [RTA_CACHEINFO] = { .len = sizeof(struct rta_cacheinfo) }, }; static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -2800,6 +2801,16 @@ static int rtm_to_fib6_config(struct sk_buff *skb, struct nlmsghdr *nlh, if (tb[RTA_ENCAP_TYPE]) cfg->fc_encap_type = nla_get_u16(tb[RTA_ENCAP_TYPE]); + if (tb[RTA_CACHEINFO]) { + struct rta_cacheinfo *ci = nla_data(tb[RTA_CACHEINFO]); + unsigned long timeout = addrconf_timeout_fixup(ci->rta_expires, HZ); + + if (addrconf_finite_timeout(timeout)) { + cfg->fc_expires = jiffies_to_clock_t(timeout * HZ); + cfg->fc_flags |= RTF_EXPIRES; + } + } + err = 0; errout: return err;
--
2.1.0