瀏覽代碼

fix(config) drop useStunTurn

Always attempt to discover the configured STUN/TURN servers.
j8
Saúl Ibarra Corretgé 4 年之前
父節點
當前提交
1d9daa8da7
共有 3 個文件被更改,包括 1 次插入14 次删除
  1. 0
    7
      config.js
  2. 0
    5
      debian/jitsi-meet-turnserver.postinst
  3. 1
    2
      react/features/base/config/configWhitelist.js

+ 0
- 7
config.js 查看文件

@@ -323,10 +323,6 @@ var config = {
323 323
     // is set in Jicofo and set to 2).
324 324
     // minParticipants: 2,
325 325
 
326
-    // Use the TURN servers discovered via XEP-0215 for the jitsi-videobridge
327
-    // connection
328
-    // useStunTurn: true,
329
-
330 326
     // Use TURN/UDP servers for the jitsi-videobridge connection (by default
331 327
     // we filter out TURN/UDP because it is usually not needed since the
332 328
     // bridge itself is reachable via UDP)
@@ -442,9 +438,6 @@ var config = {
442 438
         // connection.
443 439
         enabled: true,
444 440
 
445
-        // Use XEP-0215 to fetch STUN and TURN servers.
446
-        // useStunTurn: true,
447
-
448 441
         // The STUN servers that will be used in the peer to peer connections
449 442
         stunServers: [
450 443
 

+ 0
- 5
debian/jitsi-meet-turnserver.postinst 查看文件

@@ -150,11 +150,6 @@ denied-peer-ip=240.0.0.0-255.255.255.255" >> $TURN_CONFIG
150 150
             echo "------------------------------------------------"
151 151
         fi
152 152
 
153
-        # Enable turn server in config.js
154
-        if [ -f $JITSI_MEET_CONFIG ] ; then
155
-            sed -i "s/\/\/ useStunTurn: true/useStunTurn: true/g" $JITSI_MEET_CONFIG
156
-        fi
157
-
158 153
         # and we're done with debconf
159 154
         db_stop
160 155
     ;;

+ 1
- 2
react/features/base/config/configWhitelist.js 查看文件

@@ -3,7 +3,7 @@ import extraConfigWhitelist from './extraConfigWhitelist';
3 3
 /**
4 4
  * The config keys to whitelist, the keys that can be overridden.
5 5
  * Currently we can only whitelist the first part of the properties, like
6
- * 'p2p.useStunTurn' and 'p2p.enabled' we whitelist all p2p options.
6
+ * 'p2p.enabled' we whitelist all p2p options.
7 7
  * The whitelist is used only for config.js.
8 8
  *
9 9
  * @type Array
@@ -149,7 +149,6 @@ export default [
149 149
     'stereo',
150 150
     'subject',
151 151
     'testing',
152
-    'useStunTurn',
153 152
     'useTurnUdp',
154 153
     'videoQuality.persist',
155 154
     'webrtcIceTcpDisable',

Loading…
取消
儲存