From 19a6551de2b02c9b56483a34fdcc0fcc36dcc979 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 20 Jun 2017 08:49:38 +0100 Subject: [PATCH] ignore local IPv6 addresses/networks There is no point in paying attention to them since scope connection tracking only deals in IPv4. --- probe/host/reporter.go | 5 ++--- report/networks.go | 18 ++++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/probe/host/reporter.go b/probe/host/reporter.go index 3aff7a602..927b57ce4 100644 --- a/probe/host/reporter.go +++ b/probe/host/reporter.go @@ -93,9 +93,8 @@ var GetLocalNetworks = func() ([]*net.IPNet, error) { } localNets := report.Networks{} for _, addr := range addrs { - // Not all addrs are IPNets. - if ipNet, ok := addr.(*net.IPNet); ok { - localNets = append(localNets, ipNet) + if ipnet, ok := addr.(*net.IPNet); ok && ipnet.IP.To4() != nil { + localNets = append(localNets, ipnet) } } return localNets, nil diff --git a/report/networks.go b/report/networks.go index 42efd5e4b..f7e2fde39 100644 --- a/report/networks.go +++ b/report/networks.go @@ -52,12 +52,9 @@ func LocalAddresses() ([]net.IP, error) { } for _, addr := range addrs { - ipnet, ok := addr.(*net.IPNet) - if !ok { - continue + if ipnet, ok := addr.(*net.IPNet); ok && ipnet.IP.To4() != nil { + result = append(result, ipnet.IP) } - - result = append(result, ipnet.IP) } } @@ -78,16 +75,9 @@ func AddLocalBridge(name string) error { return err } for _, addr := range addrs { - _, network, err := net.ParseCIDR(addr.String()) - if err != nil { - return err + if ipnet, ok := addr.(*net.IPNet); ok && ipnet.IP.To4() != nil { + LocalNetworks = append(LocalNetworks, ipnet) } - - if network == nil { - continue - } - - LocalNetworks = append(LocalNetworks, network) } return nil