lordwelch/router7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dhcp6: simplify PD obtention (#9)

Browse Source
This commit is contained in:
Pablo Mazzini 2018-10-11 13:29:22 +01:00 committed by Michael Stapelberg
parent 672134080f
commit 81894ba0b3
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/dhcp6/dhcp6.go
View File

@ -287,19 +287,8 @@ func (c *Client) ObtainOrRenew() bool {
if t1.Before(newCfg.RenewAfter) || newCfg.RenewAfter.IsZero() { if t1.Before(newCfg.RenewAfter) || newCfg.RenewAfter.IsZero() {
newCfg.RenewAfter = t1 newCfg.RenewAfter = t1
} }
for b := o.Options(); len(b) > 0; { if sopt := o.GetOneOption(dhcpv6.OptionIAPrefix); sopt != nil {
sopt, err := dhcpv6.ParseOption(b) prefix := sopt.(*dhcpv6.OptIAPrefix)
if err != nil {
c.err = err
return true
}
b = b[4+sopt.Length():]
prefix, ok := sopt.(*dhcpv6.OptIAPrefix)
if !ok {
continue
}
newCfg.Prefixes = append(newCfg.Prefixes, net.IPNet{ newCfg.Prefixes = append(newCfg.Prefixes, net.IPNet{
IP: prefix.IPv6Prefix(), IP: prefix.IPv6Prefix(),
Mask: net.CIDRMask(int(prefix.PrefixLength()), 128), Mask: net.CIDRMask(int(prefix.PrefixLength()), 128),