From 63caf22671ae03f23ba93534082e91eb24a5b539 Mon Sep 17 00:00:00 2001 From: Matt Burke Date: Sat, 24 Oct 2015 01:14:25 -0400 Subject: [PATCH] Consider 'AlwaysLocalNets' in bandwidth limiters 'AlwaysLocalNets' was getting printed, but was getting used when setting up connections. Now, the nets that should be considered local are printed and used. --- cmd/syncthing/main.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 74f1ebba..2d232a6b 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -600,17 +600,18 @@ func syncthingMain() { if (opts.MaxRecvKbps > 0 || opts.MaxSendKbps > 0) && !opts.LimitBandwidthInLan { lans, _ = osutil.GetLans() - networks := make([]string, 0, len(lans)) - for _, lan := range lans { - networks = append(networks, lan.String()) - } for _, lan := range opts.AlwaysLocalNets { _, ipnet, err := net.ParseCIDR(lan) if err != nil { l.Infoln("Network", lan, "is malformed:", err) continue } - networks = append(networks, ipnet.String()) + lans = append(lans, ipnet) + } + + networks := make([]string, len(lans)) + for i, lan := range lans { + networks[i] = lan.String() } l.Infoln("Local networks:", strings.Join(networks, ", ")) }