a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

linter

This commit is contained in:
Simon Zolin 2020-01-31 13:27:53 +03:00
parent 143a86a28a
commit 84b5708e71
2 changed files with 0 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dhcpd/network_utils.go
View File

@ -11,7 +11,6 @@ import (
"github.com/AdguardTeam/golibs/file" "github.com/AdguardTeam/golibs/file"
"github.com/AdguardTeam/golibs/log" "github.com/AdguardTeam/golibs/log"
"github.com/joomcode/errorx"
) )
type netInterface struct { type netInterface struct {
@ -45,57 +44,6 @@ func getValidNetInterfaces() ([]net.Interface, error) {
return netIfaces, nil return netIfaces, nil
} }
// getValidNetInterfacesMap returns interfaces that are eligible for DNS and WEB only
// we do not return link-local addresses here
// nolint:dupl
func getValidNetInterfacesForWeb() ([]netInterface, error) {
ifaces, err := getValidNetInterfaces()
if err != nil {
return nil, errorx.Decorate(err, "Couldn't get interfaces")
}
if len(ifaces) == 0 {
return nil, errors.New("couldn't find any legible interface")
}
var netInterfaces []netInterface
for _, iface := range ifaces {
addrs, e := iface.Addrs()
if e != nil {
return nil, errorx.Decorate(e, "Failed to get addresses for interface %s", iface.Name)
}
netIface := netInterface{
Name: iface.Name,
MTU: iface.MTU,
HardwareAddr: iface.HardwareAddr.String(),
}
if iface.Flags != 0 {
netIface.Flags = iface.Flags.String()
}
// we don't want link-local addresses in json, so skip them
for _, addr := range addrs {
ipnet, ok := addr.(*net.IPNet)
if !ok {
// not an IPNet, should not happen
return nil, fmt.Errorf("got iface.Addrs() element %s that is not net.IPNet, it is %T", addr, addr)
}
// ignore link-local
if ipnet.IP.IsLinkLocalUnicast() {
continue
}
netIface.Addresses = append(netIface.Addresses, ipnet.IP.String())
}
if len(netIface.Addresses) != 0 {
netInterfaces = append(netInterfaces, netIface)
}
}
return netInterfaces, nil
}
// Check if network interface has a static IP configured // Check if network interface has a static IP configured
// Supports: Raspbian. // Supports: Raspbian.
func hasStaticIP(ifaceName string) (bool, error) { func hasStaticIP(ifaceName string) (bool, error) {

1
home/network_utils.go
View File

@ -51,7 +51,6 @@ func getValidNetInterfaces() ([]net.Interface, error) {
// getValidNetInterfacesMap returns interfaces that are eligible for DNS and WEB only // getValidNetInterfacesMap returns interfaces that are eligible for DNS and WEB only
// we do not return link-local addresses here // we do not return link-local addresses here
// nolint:dupl
func getValidNetInterfacesForWeb() ([]netInterface, error) { func getValidNetInterfacesForWeb() ([]netInterface, error) {
ifaces, err := getValidNetInterfaces() ifaces, err := getValidNetInterfaces()
if err != nil { if err != nil {