From 3f4642d49af70af90406d885d3b207acb33256a5 Mon Sep 17 00:00:00 2001
From: Evan Theurer <theurer@struktur.de>
Date: Thu, 5 Nov 2015 10:29:10 +0100
Subject: [PATCH] Add new server flag.

---
 server.conf.in                         |  2 ++
 src/app/spreed-webrtc-server/config.go | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/server.conf.in b/server.conf.in
index b57031a7..94fb850d 100644
--- a/server.conf.in
+++ b/server.conf.in
@@ -57,6 +57,8 @@ listen = 127.0.0.1:8080
 ; See http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00 for details.
 ; A supported TURN server is https://code.google.com/p/rfc5766-turn-server/.
 ;turnSecret = the-default-turn-shared-secret-do-not-keep
+; Enable adding TURN servers inside of the clientside webui under settings
+;turnURIsClientSideSetable = false
 ; Enable renegotiation support. Set to true to tell clients that they can
 ; renegotiate peer connections when required. Firefox support is not complete,
 ; so do not enable if you want compatibility with Firefox clients.
diff --git a/src/app/spreed-webrtc-server/config.go b/src/app/spreed-webrtc-server/config.go
index 89a14c54..57e23a03 100644
--- a/src/app/spreed-webrtc-server/config.go
+++ b/src/app/spreed-webrtc-server/config.go
@@ -39,6 +39,7 @@ type Config struct {
 	Renegotiation                   bool            // Renegotiation flag
 	StunURIs                        []string        // STUN server URIs
 	TurnURIs                        []string        // TURN server URIs
+	TurnURIsClientSideSetable       bool            // Enable TURN server customization under settings in web ui
 	Tokens                          bool            // True when we got a tokens file
 	Version                         string          // Server version number
 	UsersEnabled                    bool            // Flag if users are enabled
@@ -108,14 +109,15 @@ func NewConfig(container phoenix.Container, tokens bool) *Config {
 	log.Println("Enabled modules:", modules)
 
 	return &Config{
-		Title:                           container.GetStringDefault("app", "title", "Spreed WebRTC"),
-		ver:                             ver,
-		S:                               fmt.Sprintf("static/ver=%s", ver),
-		B:                               basePath,
-		Token:                           serverToken,
-		Renegotiation:                   container.GetBoolDefault("app", "renegotiation", false),
-		StunURIs:                        stunURIs,
-		TurnURIs:                        turnURIs,
+		Title:                     container.GetStringDefault("app", "title", "Spreed WebRTC"),
+		ver:                       ver,
+		S:                         fmt.Sprintf("static/ver=%s", ver),
+		B:                         basePath,
+		Token:                     serverToken,
+		Renegotiation:             container.GetBoolDefault("app", "renegotiation", false),
+		StunURIs:                  stunURIs,
+		TurnURIs:                  turnURIs,
+		TurnURIsClientSideSetable: container.GetBoolDefault("app", "turnClientSideSetable", true),
 		Tokens:                          tokens,
 		Version:                         version,
 		UsersEnabled:                    container.GetBoolDefault("users", "enabled", false),