octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-23 11:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consider 'AlwaysLocalNets' in bandwidth limiters

Browse Source 
'AlwaysLocalNets' was getting printed, but was getting used
when setting up connections. Now, the nets that should be
considered local are printed and used.
This commit is contained in:
Matt Burke 2015-10-24 01:14:25 -04:00
parent 7b5ab29a6d
commit 63caf22671
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/syncthing/main.go
View File

@ -600,17 +600,18 @@ func syncthingMain() {
if (opts.MaxRecvKbps > 0 || opts.MaxSendKbps > 0) && !opts.LimitBandwidthInLan { if (opts.MaxRecvKbps > 0 || opts.MaxSendKbps > 0) && !opts.LimitBandwidthInLan {
lans, _ = osutil.GetLans() lans, _ = osutil.GetLans()
networks := make([]string, 0, len(lans))
for _, lan := range lans {
networks = append(networks, lan.String())
}
for _, lan := range opts.AlwaysLocalNets { for _, lan := range opts.AlwaysLocalNets {
_, ipnet, err := net.ParseCIDR(lan) _, ipnet, err := net.ParseCIDR(lan)
if err != nil { if err != nil {
l.Infoln("Network", lan, "is malformed:", err) l.Infoln("Network", lan, "is malformed:", err)
continue 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, ", ")) l.Infoln("Local networks:", strings.Join(networks, ", "))
} }