Add route lifetime from Router Advertisement

src/if-linux.c

@@ -752,6 +752,9 @@ if_copyrt(struct dhcpcd_ctx *ctx, struct rt *rt, struct nlmsghdr *nlm)
 			}
 			break;
 		}
+		case RTA_EXPIRES:
+			rt->rt_expires = *(uint32_t *)RTA_DATA(rta);
+			break;
 		}
 
 		if (sa != NULL) {
@@ -1735,6 +1738,9 @@ if_route(unsigned char cmd, const struct rt *rt)
 	if (!sa_is_loopback(&rt->rt_gateway))
 		add_attr_32(&nlm.hdr, sizeof(nlm), RTA_OIF, rt->rt_ifp->index);
 
+	/* add route lifetime */
+	add_attr_32(&nlm.hdr, sizeof(nlm), RTA_EXPIRES, rt->rt_expires);
+
 	if (rt->rt_metric != 0)
 		add_attr_32(&nlm.hdr, sizeof(nlm), RTA_PRIORITY,
 		    rt->rt_metric);

src/ipv6.c

@@ -2301,6 +2301,10 @@ inet6_raroutes(rb_tree_t *routes, struct dhcpcd_ctx *ctx)
 	const struct routeinfo *rinfo;
 	const struct ipv6_addr *addr;
 	struct in6_addr netmask;
+	struct timespec now;
+	uint32_t elapsed;
+
+	clock_gettime(CLOCK_MONOTONIC, &now);
 
 	if (ctx->ra_routers == NULL)
 		return 0;
@@ -2325,6 +2329,8 @@ inet6_raroutes(rb_tree_t *routes, struct dhcpcd_ctx *ctx)
 #ifdef HAVE_ROUTE_PREF
 			rt->rt_pref = ipv6nd_rtpref(rinfo->flags);
 #endif
+			elapsed = (uint32_t)eloop_timespec_diff(&now, &rap->acquired, NULL);
+			rt->rt_expires = rap->lifetime - elapsed;
 
 			rt_proto_add(routes, rt);
 		}
@@ -2339,6 +2345,9 @@ inet6_raroutes(rb_tree_t *routes, struct dhcpcd_ctx *ctx)
 #ifdef HAVE_ROUTE_PREF
 				rt->rt_pref = ipv6nd_rtpref(rap->flags);
 #endif
+				elapsed = (uint32_t)eloop_timespec_diff(&now, &rap->acquired, NULL);
+				rt->rt_expires = rap->lifetime - elapsed;
+
 				rt_proto_add(routes, rt);
 			}
 		}
@@ -2370,6 +2379,9 @@ inet6_raroutes(rb_tree_t *routes, struct dhcpcd_ctx *ctx)
 #ifdef HAVE_ROUTE_PREF
 		rt->rt_pref = ipv6nd_rtpref(rap->flags);
 #endif
+		elapsed = (uint32_t)eloop_timespec_diff(&now, &rap->acquired, NULL);
+		rt->rt_expires = rap->lifetime - elapsed;
+
 		rt_proto_add(routes, rt);
 	}
 	return 0;

src/route.h

@@ -120,6 +120,7 @@ struct rt {
 #define	RTDF_GATELINK		0x40		/* Gateway is on link */
 	size_t			rt_order;
 	rb_node_t		rt_tree;
+	uint32_t		rt_expires;	/* current lifetime of route */
 };
 
 extern const rb_tree_ops_t rt_compare_list_ops;