daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: 2606 substitute nclient4 with fork

Browse Source 
Merge in DNS/adguard-home from 2606-rm-nclient4 to master

Closes #2606.

Squashed commit of the following:

commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 21 13:22:56 2021 +0300

    nclient4: rm

commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 21 13:19:11 2021 +0300

    all: clear changes

commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 21 12:58:48 2021 +0300

    Merge branch 'master' into 2606-rm-nclient4

commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 19 18:53:04 2021 +0300

    dhcpd: subst nclient4 with fork
This commit is contained in:
Eugene Burkov
2021-04-21 13:41:18 +03:00
parent c26675585d
commit 2e4e1973d9
7 changed files with 5 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/dhcpd/checkother.go
View File

@@ -10,9 +10,9 @@ import (
"runtime"
"time"
"github.com/AdguardTeam/AdGuardHome/internal/dhcpd/nclient4"
"github.com/AdguardTeam/golibs/log"
"github.com/insomniacslk/dhcp/dhcpv4"
"github.com/insomniacslk/dhcp/dhcpv4/nclient4"
"github.com/insomniacslk/dhcp/dhcpv6"
"github.com/insomniacslk/dhcp/dhcpv6/nclient6"
"github.com/insomniacslk/dhcp/iana"