AdguardTeam/AdGuardHome
1
1
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-12-15 03:02:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pull request: fix zero-length ip addresses list bug

Browse Source 
Merge in DNS/adguard-home from 2304-fix-panic to master

Updates #2304.

Squashed commit of the following:

commit bd7742eb144b46e16c751f98f6a4a6f15fbfa60e
Merge: 26313926e 7d1d87d6e
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Dec 2 14:29:37 2020 +0300

    Merge branch 'master' into 2304-fix-panic

commit 26313926e827d1f5ceb4eec744b814ce7c32663d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Dec 2 14:09:16 2020 +0300

    all: add gitignore rule

commit 5a8521bd9b4014972107e8de352e20144f8187fb
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Dec 2 14:03:26 2020 +0300

    dhcpd: fix zero-length ip addresses list bug
This commit is contained in:
Eugene Burkov 2020-12-02 14:42:59 +03:00
parent 7d1d87d6ec
commit ab8defdb08
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,6 +12,7 @@
/querylog.json /querylog.json
/querylog.json.1 /querylog.json.1
coverage.txt coverage.txt
leases.db
# Test output # Test output
dnsfilter/tests/top-1m.csv dnsfilter/tests/top-1m.csv

5
internal/dhcpd/v4.go
View File

@ -581,6 +581,11 @@ func (s *v4Server) Start() error {
return fmt.Errorf("dhcpv4: interface %s: %w", ifaceName, err) return fmt.Errorf("dhcpv4: interface %s: %w", ifaceName, err)
} }
if len(dnsIPAddrs) == 0 {
// No available IP addresses which may appear later.
return nil
}
s.conf.dnsIPAddrs = dnsIPAddrs s.conf.dnsIPAddrs = dnsIPAddrs
laddr := &net.UDPAddr{ laddr := &net.UDPAddr{

5
internal/dhcpd/v6.go
View File

@ -579,6 +579,11 @@ func (s *v6Server) Start() error {
return fmt.Errorf("dhcpv6: interface %s: %w", ifaceName, err) return fmt.Errorf("dhcpv6: interface %s: %w", ifaceName, err)
} }
if len(dnsIPAddrs) == 0 {
// No available IP addresses which may appear later.
return nil
}
s.conf.dnsIPAddrs = dnsIPAddrs s.conf.dnsIPAddrs = dnsIPAddrs
err = s.initRA(iface) err = s.initRA(iface)