Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add route lifetime from Router Advertisement #429

Merged
merged 18 commits into from
Jan 15, 2025
+37 −0
Merged

Add route lifetime from Router Advertisement #429

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
14508ef
Add route lifetime from Router Advertisement
ColinMcInnes Jan 8, 2025
3b004f8
Fix whitespace
ColinMcInnes Jan 8, 2025
4526bb6
Fix whitespace
ColinMcInnes Jan 8, 2025
1f4b9f1
Add RTA_EXPIRES to if_copyrt
ColinMcInnes Jan 9, 2025
1ecf245
Use uint32_t for RTA_EXPIRES
ColinMcInnes Jan 9, 2025
a3c95eb
Change rt_expires to uint32_t in struct
ColinMcInnes Jan 9, 2025
fa8a1ac
Account for elapsed time when updating route lifetime in netlink
ColinMcInnes Jan 9, 2025
d2306bd
update elapsed route lifetime
ColinMcInnes Jan 9, 2025
4a07e73
Only send non-zero route lifetime to NETLINK
ColinMcInnes Jan 9, 2025
fb70fe8
Only send non-zero route lifetime to NETLINK
ColinMcInnes Jan 9, 2025
2d2e7be
Move route lifetime calc to common func
ColinMcInnes Jan 10, 2025
0f13be7
Fixed typos and missing header
ColinMcInnes Jan 10, 2025
8453c57
Typo in route acquired
ColinMcInnes Jan 10, 2025
1974f2e
Use correct route lifetime sources for rinfo and addr
ColinMcInnes Jan 13, 2025
cfcf427
Fix whitespace
ColinMcInnes Jan 13, 2025
cbb58c4
Fixed ND6_INFINITE_LIFETIME truncation
ColinMcInnes Jan 13, 2025
2637f07
Pass acquired-time pointer by value
ColinMcInnes Jan 14, 2025
5179c46
Move variable declaration to top of scope
ColinMcInnes Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/ipv6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
ColinMcInnes marked this conversation as resolved.
Show resolved Hide resolved

if (ctx->ra_routers == NULL)
return 0;
Expand All @@ -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);
ColinMcInnes marked this conversation as resolved.
Show resolved Hide resolved
rt->rt_expires = rap->lifetime - elapsed;

rt_proto_add(routes, rt);
}
Expand All @@ -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);
ColinMcInnes marked this conversation as resolved.
Show resolved Hide resolved
rt->rt_expires = rap->lifetime - elapsed;

rt_proto_add(routes, rt);
}
}
Expand Down Expand Up @@ -2370,7 +2379,8 @@ inet6_raroutes(rb_tree_t *routes, struct dhcpcd_ctx *ctx)
#ifdef HAVE_ROUTE_PREF
rt->rt_pref = ipv6nd_rtpref(rap->flags);
#endif
rt->rt_expires = rap->lifetime;
elapsed = (uint32_t)eloop_timespec_diff(&now, &rap->acquired, NULL);
rt->rt_expires = rap->lifetime - elapsed;

rt_proto_add(routes, rt);
}
Expand Down
Loading