Add switch to disable relays

This commit is contained in:
Audrius Butkevicius
2015-07-24 20:07:26 +01:00
parent 031804827f
commit 1e8b185377
5 changed files with 16 additions and 4 deletions

View File

@@ -676,7 +676,7 @@ func syncthingMain() {
connectionSvc := newConnectionSvc(cfg, myID, m, tlsCfg)
mainSvc.Add(connectionSvc)
if opts.GlobalAnnEnabled || opts.RelayWithoutGlobalAnn {
if opts.RelaysEnabled && (opts.GlobalAnnEnabled || opts.RelayWithoutGlobalAnn) {
relaySvc = relay.NewSvc(cfg, tlsCfg, connectionSvc.conns)
connectionSvc.Add(relaySvc)
}