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

Pull request: aghnet: do not expect dhcpdc.conf to exist

Browse Source 
Updates #3257.

Squashed commit of the following:

commit f3c335932e365dace0720e8986c217cf6f7ae162
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 15 19:56:23 2021 +0300

    aghnet: fix docs, names

commit 513ade2e46a9292411c9b9636437f17ee549ea5e
Merge: aa58f1dd 9f5a015f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 15 19:43:24 2021 +0300

    Merge branch 'master' into 3257-dhcpdc-conf

commit aa58f1ddb8065cafabc835decc5bf73ffb49e742
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jun 15 17:18:19 2021 +0300

    aghnet: do not expect dhcpdc.conf to exist
This commit is contained in:
Ainar Garipov
2021-06-15 20:01:38 +03:00
parent 9f5a015f42
commit 39ee66266a
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/aghnet/net_linux_test.go
View File

@@ -102,22 +102,29 @@ func TestSetStaticIPdhcpcdConf(t *testing.T) {
routers net.IP
}{{
name: "with_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
dhcpcdConf: nl + `# wlan0 added by AdGuard Home.` + nl +
`interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: net.IP{192, 168, 0, 1},
}, {
name: "without_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
dhcpcdConf: nl + `# wlan0 added by AdGuard Home.` + nl +
`interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: nil,
}}
ipNet := &net.IPNet{
IP: net.IP{192, 168, 0, 2},
Mask: net.IPMask{255, 255, 255, 0},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", tc.routers, net.IP{192, 168, 0, 2})
s := dhcpcdConfIface("wlan0", ipNet, tc.routers, net.IP{192, 168, 0, 2})
assert.Equal(t, tc.dhcpcdConf, s)
})
}