Do not start relay service unless explicitly asked for, or global announcement server is running

2015-07-24 19:55:52 +01:00
parent 6cccd9b6fc
commit 031804827f
4 changed files with 10 additions and 3 deletions
--- a/lib/config/config_test.go
+++ b/lib/config/config_test.go
@@ -42,6 +42,7 @@ func TestDefaultValues(t *testing.T) {
 		MaxRecvKbps:             0,
 		ReconnectIntervalS:      60,
 		RelayReconnectIntervalM: 10,
+		RelayWithoutGlobalAnn:   false,
 		StartBrowser:            true,
 		UPnPEnabled:             true,
 		UPnPLeaseM:              60,
@@ -155,6 +156,7 @@ func TestOverriddenValues(t *testing.T) {
 		MaxRecvKbps:             2341,
 		ReconnectIntervalS:      6000,
 		RelayReconnectIntervalM: 20,
+		RelayWithoutGlobalAnn:   true,
 		StartBrowser:            false,
 		UPnPEnabled:             false,
 		UPnPLeaseM:              90,