Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/dhcpcd.8.in
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ and
.Nm
is also an implementation of the IPv6 Privacy Extensions to AutoConf as
specified in
.Li RFC 4941 .
.Li RFC 8981 .
This feature needs to be enabled in the kernel and
.Nm
will start using it.
Expand Down Expand Up @@ -876,8 +876,8 @@ RFC\ 951, RFC\ 1534, RFC\ 2104, RFC\ 2131, RFC\ 2132, RFC\ 2563, RFC\ 2855,
RFC\ 3004, RFC\ 3118, RFC\ 3203, RFC\ 3315, RFC\ 3361, RFC\ 3633, RFC\ 3396,
RFC\ 3397, RFC\ 3442, RFC\ 3495, RFC\ 3925, RFC\ 3927, RFC\ 4039, RFC\ 4075,
RFC\ 4242, RFC\ 4361, RFC\ 4390, RFC\ 4702, RFC\ 4074, RFC\ 4861, RFC\ 4833,
RFC\ 4941, RFC\ 5227, RFC\ 5942, RFC\ 5969, RFC\ 6106, RFC\ 6334, RFC\ 6355,
RFC\ 6603, RFC\ 6704, RFC\ 7217, RFC\ 7550, RFC\ 7844.
RFC\ 5227, RFC\ 5942, RFC\ 5969, RFC\ 6106, RFC\ 6334, RFC\ 6355,
RFC\ 6603, RFC\ 6704, RFC\ 7217, RFC\ 7550, RFC\ 7844, RFC\ 8981.
.Sh AUTHORS
.An Roy Marples Aq Mt roy@marples.name
.Sh BUGS
Expand Down
2 changes: 1 addition & 1 deletion src/dhcpcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ dhcpcd_handlecarrier(struct interface *ifp, int carrier, unsigned int flags)
* would normally as we maybe on a new network. */
ipv6nd_startexpire(ifp);
#ifdef IPV6_MANAGETEMPADDR
/* RFC4941 Section 3.5 */
/* RFC 8981 Section 3.6 */
ipv6_regentempaddrs(ifp);
#endif
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/dhcpcd.conf.5.in
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ The default is 180 seconds.
.It Ic ssid Ar ssid
Subsequent options are only parsed for this wireless
.Ar ssid .
.It Ic slaac Ic hwaddr | Ic private | Ic token Ar token Op Ic temp | Ic temporary
.It Ic slaac Oo Ic hwaddr | Ic private | Ic token Ar token Oc Oo Ic temp | Ic temporary Oc
Selects the interface identifier used for SLAAC generated IPv6 addresses.
If
.Ic private
Expand All @@ -743,7 +743,7 @@ If
is used then the token is combined with the prefix to make the final address.
The
.Ic temporary
directive will create a temporary address for the prefix as well.
directive will create a RFC 8981 temporary address for the prefix.
.It Ic static Ar value
Configures a static
.Ar value .
Expand Down
45 changes: 26 additions & 19 deletions src/if-options.c
Original file line number Diff line number Diff line change
Expand Up @@ -2525,30 +2525,37 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
}
if (strcmp(arg, "private") == 0 ||
strcmp(arg, "stableprivate") == 0 ||
strcmp(arg, "stable") == 0)
strcmp(arg, "stable") == 0) {
ifo->options |= DHCPCD_SLAACPRIVATE;
else
arg = np;
} else {
ifo->options &= ~DHCPCD_SLAACPRIVATE;
#ifdef INET6
if (strcmp(arg, "token") == 0) {
if (np == NULL) {
logerrx("slaac token: no token specified");
return -1;
}
arg = np;
np = strwhite(np);
if (np != NULL) {
*np++ = '\0';
np = strskipwhite(np);
}
if (inet_pton(AF_INET6, arg, &ifo->token) != 1) {
logerrx("slaac token: invalid token");
return -1;
if (strcmp(arg, "token") == 0) {
if (np == NULL) {
logerrx(
"slaac token: no token specified");
return -1;
}
arg = np;
np = strwhite(np);
if (np != NULL) {
*np++ = '\0';
np = strskipwhite(np);
}
if (inet_pton(AF_INET6, arg, &ifo->token) !=
1) {
logerrx("slaac token: invalid token");
return -1;
}
arg = np;
}
}
#endif
if (np != NULL &&
(strcmp(np, "temp") == 0 || strcmp(np, "temporary") == 0))
}

if (arg == NULL)
break;
if (strcmp(arg, "temp") == 0 || strcmp(arg, "temporary") == 0)
Comment thread
coderabbitai[bot] marked this conversation as resolved.
ifo->options |= DHCPCD_SLAACTEMP;
break;
case O_BOOTP:
Expand Down
Loading
Loading