Browse Source

Improve server flag name.

pull/242/head
Evan Theurer 11 years ago
parent
commit
bf0ac08a88
  1. 4
      server.conf.in
  2. 20
      src/app/spreed-webrtc-server/config.go
  3. 2
      static/js/mediastream/api.js
  4. 4
      static/js/services/constraints.js
  5. 2
      static/js/services/turnsettings.js

4
server.conf.in

@ -57,8 +57,8 @@ listen = 127.0.0.1:8080
; See http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00 for details. ; 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/. ; A supported TURN server is https://code.google.com/p/rfc5766-turn-server/.
;turnSecret = the-default-turn-shared-secret-do-not-keep ;turnSecret = the-default-turn-shared-secret-do-not-keep
; Enable adding TURN servers inside of the clientside webui under settings ; Enable adding TURN servers inside of the client side webui under settings
;turnURIsClientSideSetable = false ;turnClientSideSetable = false
; Enable renegotiation support. Set to true to tell clients that they can ; Enable renegotiation support. Set to true to tell clients that they can
; renegotiate peer connections when required. Firefox support is not complete, ; renegotiate peer connections when required. Firefox support is not complete,
; so do not enable if you want compatibility with Firefox clients. ; so do not enable if you want compatibility with Firefox clients.

20
src/app/spreed-webrtc-server/config.go

@ -39,7 +39,7 @@ type Config struct {
Renegotiation bool // Renegotiation flag Renegotiation bool // Renegotiation flag
StunURIs []string // STUN server URIs StunURIs []string // STUN server URIs
TurnURIs []string // TURN server URIs TurnURIs []string // TURN server URIs
TurnURIsClientSideSetable bool // Enable TURN server customization under settings in web ui TurnClientSideSetable bool // Enable TURN server customization under settings in web ui
Tokens bool // True when we got a tokens file Tokens bool // True when we got a tokens file
Version string // Server version number Version string // Server version number
UsersEnabled bool // Flag if users are enabled UsersEnabled bool // Flag if users are enabled
@ -109,15 +109,15 @@ func NewConfig(container phoenix.Container, tokens bool) *Config {
log.Println("Enabled modules:", modules) log.Println("Enabled modules:", modules)
return &Config{ return &Config{
Title: container.GetStringDefault("app", "title", "Spreed WebRTC"), Title: container.GetStringDefault("app", "title", "Spreed WebRTC"),
ver: ver, ver: ver,
S: fmt.Sprintf("static/ver=%s", ver), S: fmt.Sprintf("static/ver=%s", ver),
B: basePath, B: basePath,
Token: serverToken, Token: serverToken,
Renegotiation: container.GetBoolDefault("app", "renegotiation", false), Renegotiation: container.GetBoolDefault("app", "renegotiation", false),
StunURIs: stunURIs, StunURIs: stunURIs,
TurnURIs: turnURIs, TurnURIs: turnURIs,
TurnURIsClientSideSetable: container.GetBoolDefault("app", "turnURIsClientSideSetable", false), TurnClientSideSetable: container.GetBoolDefault("app", "turnClientSideSetable", false),
Tokens: tokens, Tokens: tokens,
Version: version, Version: version,
UsersEnabled: container.GetBoolDefault("users", "enabled", false), UsersEnabled: container.GetBoolDefault("users", "enabled", false),

2
static/js/mediastream/api.js

@ -151,7 +151,7 @@ define(['jquery', 'underscore', 'ua-parser'], function($, _, uaparser) {
switch (dataType) { switch (dataType) {
case "Self": case "Self":
console.log("Self received", data); //console.log("Self received", data);
if (data.Token) { if (data.Token) {
this.connector.token = data.Token; this.connector.token = data.Token;
} }

4
static/js/services/constraints.js

@ -143,7 +143,6 @@
iceServers.push(createIceServers(service.stun)); iceServers.push(createIceServers(service.stun));
} }
if (service.turn && service.turn.urls && service.turn.urls.length) { if (service.turn && service.turn.urls && service.turn.urls.length) {
console.log('iceServers', service.turn);
iceServers.push(createIceServers(service.turn.urls, service.turn.username, service.turn.password)); iceServers.push(createIceServers(service.turn.urls, service.turn.username, service.turn.password));
} }
webrtc.settings.pcConfig.iceServers = iceServers; webrtc.settings.pcConfig.iceServers = iceServers;
@ -186,7 +185,6 @@
// Setters for TURN and STUN data. // Setters for TURN and STUN data.
turn: function(turnData) { turn: function(turnData) {
service.turn = turnData; service.turn = turnData;
console.log("turnData", service.turn);
}, },
stun: function(stunData) { stun: function(stunData) {
service.stun = stunData; service.stun = stunData;
@ -213,4 +211,4 @@
}]; }];
}); });

2
static/js/services/turnsettings.js

@ -29,7 +29,7 @@ define(["angular"], function(angular) {
*/ */
return ['mediaStream', 'appData', 'constraints', function(mediaStream, appData, constraints) { return ['mediaStream', 'appData', 'constraints', function(mediaStream, appData, constraints) {
var preferClientSideTurnSettings = mediaStream.config.TurnURIsClientSideSetable; var preferClientSideTurnSettings = mediaStream.config.TurnClientSideSetable;
var turnConfigServer = null; var turnConfigServer = null;
/** /**

Loading…
Cancel
Save