From 66f7d83baa64d85ff8b2213143ce1d18dff5fbc1 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Thu, 26 Mar 2015 13:57:27 +0100 Subject: [PATCH] Don't allow arbitrarily short reconnection intervals (fixes #1524) --- internal/config/config.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/internal/config/config.go b/internal/config/config.go index c194c8515..0462a6a67 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -370,6 +370,11 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) { } } + // Very short reconnection intervals are annoying + if cfg.Options.ReconnectIntervalS < 5 { + cfg.Options.ReconnectIntervalS = 5 + } + cfg.Options.ListenAddress = uniqueStrings(cfg.Options.ListenAddress) cfg.Options.GlobalAnnServers = uniqueStrings(cfg.Options.GlobalAnnServers)