From 1ef56f6af6b25068b4265610801e806913b9db7c Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 20 Jun 2017 11:03:06 +0100 Subject: [PATCH] refactor: extract common code --- report/networks.go | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/report/networks.go b/report/networks.go index c177743bf..c2797760d 100644 --- a/report/networks.go +++ b/report/networks.go @@ -45,10 +45,8 @@ func LocalAddresses() ([]net.IP, error) { return []net.IP{}, err } - for _, addr := range addrs { - if ipnet, ok := addr.(*net.IPNet); ok && ipnet.IP.To4() != nil { - result = append(result, ipnet.IP) - } + for _, ipnet := range ipv4Nets(addrs) { + result = append(result, ipnet.IP) } } @@ -68,11 +66,8 @@ func AddLocalBridge(name string) error { if err != nil { return err } - for _, addr := range addrs { - if ipnet, ok := addr.(*net.IPNet); ok && ipnet.IP.To4() != nil { - LocalNetworks = append(LocalNetworks, ipnet) - } - } + + LocalNetworks = ipv4Nets(addrs) return nil } @@ -83,11 +78,15 @@ func GetLocalNetworks() ([]*net.IPNet, error) { if err != nil { return nil, err } - localNets := Networks{} + return ipv4Nets(addrs), nil +} + +func ipv4Nets(addrs []net.Addr) []*net.IPNet { + nets := Networks{} for _, addr := range addrs { if ipnet, ok := addr.(*net.IPNet); ok && ipnet.IP.To4() != nil { - localNets = append(localNets, ipnet) + nets = append(nets, ipnet) } } - return localNets, nil + return nets }