Pārlūkot izejas kodu

Move STUN/TURN to IANA-assigned ports - 3478 and 5349 (TLS) (#6172)

* Move STUN/TURN to IANA-assigned ports - 3478 and 5349 (TLS)

* Change remaining references to TURNS port from 4445 to 5349

* Change back TURNS to 443
master
Frank de Lange 5 gadus atpakaļ
vecāks
revīzija
29c16e42bd
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam

+ 1
- 1
config.js Parādīt failu

361
         // The STUN servers that will be used in the peer to peer connections
361
         // The STUN servers that will be used in the peer to peer connections
362
         stunServers: [
362
         stunServers: [
363
 
363
 
364
-            // { urls: 'stun:jitsi-meet.example.com:4446' },
364
+            // { urls: 'stun:jitsi-meet.example.com:3478' },
365
             { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' }
365
             { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' }
366
         ]
366
         ]
367
 
367
 

+ 2
- 2
debian/jitsi-meet-turnserver.postinst Parādīt failu

49
                 # nothing to do
49
                 # nothing to do
50
                 echo "------------------------------------------------"
50
                 echo "------------------------------------------------"
51
                 echo ""
51
                 echo ""
52
-                echo "turnserver is listening on tcp 4445 as other nginx sites use port 443"
52
+                echo "turnserver is listening on tcp 5349 as other nginx sites use port 443"
53
                 echo ""
53
                 echo ""
54
                 echo "------------------------------------------------"
54
                 echo "------------------------------------------------"
55
                 NGINX_MULTIPLEXING="false"
55
                 NGINX_MULTIPLEXING="false"
152
             PROSODY_HOST_CONFIG="/etc/prosody/conf.avail/$JVB_HOSTNAME.cfg.lua"
152
             PROSODY_HOST_CONFIG="/etc/prosody/conf.avail/$JVB_HOSTNAME.cfg.lua"
153
             if [ -f $PROSODY_HOST_CONFIG ] ; then
153
             if [ -f $PROSODY_HOST_CONFIG ] ; then
154
                 # If we are not multiplexing we need to change the port in prosody config
154
                 # If we are not multiplexing we need to change the port in prosody config
155
-                sed -i 's/"443"/"4445"/g' $PROSODY_HOST_CONFIG
155
+                sed -i 's/"443"/"5349"/g' $PROSODY_HOST_CONFIG
156
                 invoke-rc.d prosody restart || true
156
                 invoke-rc.d prosody restart || true
157
             fi
157
             fi
158
         fi
158
         fi

+ 2
- 2
doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example Parādīt failu

6
 turncredentials_secret = "__turnSecret__";
6
 turncredentials_secret = "__turnSecret__";
7
 
7
 
8
 turncredentials = {
8
 turncredentials = {
9
-  { type = "stun", host = "jitmeet.example.com", port = "4446" },
10
-  { type = "turn", host = "jitmeet.example.com", port = "4446", transport = "udp" },
9
+  { type = "stun", host = "jitmeet.example.com", port = "3478" },
10
+  { type = "turn", host = "jitmeet.example.com", port = "3478", transport = "udp" },
11
   { type = "turns", host = "jitmeet.example.com", port = "443", transport = "tcp" }
11
   { type = "turns", host = "jitmeet.example.com", port = "443", transport = "tcp" }
12
 };
12
 };
13
 
13
 

+ 2
- 2
doc/debian/jitsi-meet-turn/turnserver.conf Parādīt failu

10
 no-loopback-peers
10
 no-loopback-peers
11
 no-tcp-relay
11
 no-tcp-relay
12
 no-tcp
12
 no-tcp
13
-listening-port=4446
14
-tls-listening-port=4445
13
+listening-port=3478
14
+tls-listening-port=5349
15
 external-ip=__external_ip_address__
15
 external-ip=__external_ip_address__
16
 no-tlsv1
16
 no-tlsv1
17
 no-tlsv1_1
17
 no-tlsv1_1

+ 1
- 1
doc/debian/jitsi-meet/jitsi-meet.conf Parādīt failu

7
         server 127.0.0.1:4444;
7
         server 127.0.0.1:4444;
8
     }
8
     }
9
     upstream turn {
9
     upstream turn {
10
-        server 127.0.0.1:4445;
10
+        server 127.0.0.1:5349;
11
     }
11
     }
12
     # since 1.13.10
12
     # since 1.13.10
13
     map $ssl_preread_alpn_protocols $upstream {
13
     map $ssl_preread_alpn_protocols $upstream {

Notiek ielāde…
Atcelt
Saglabāt