jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

STUN/TURN Server URI schemes 'stuns' and 'turns' are not currently supported

Browse Source
This commit is contained in:
Juha Heinanen
2020-11-17 17:43:10 +02:00
parent 05aa9ba549
commit 45acdeb232
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+1 -1
View File
@@ -340,7 +340,7 @@ class AccountActivity : AppCompatActivity() {
if (((mediaNat == "stun") || (mediaNat == "ice")) && (newStunServer == "")) if (((mediaNat == "stun") || (mediaNat == "ice")) && (newStunServer == ""))
newStunServer = resources.getString(R.string.stun_server_default) newStunServer = resources.getString(R.string.stun_server_default)
if (!Utils.checkStunUri(newStunServer) || if (!Utils.checkStunUri(newStunServer) ||
((mediaNat == "turn") && !newStunServer.startsWith("turn"))) { ((mediaNat == "turn") && !newStunServer.startsWith("turn:"))) {
Utils.alertView(this, getString(R.string.notice), Utils.alertView(this, getString(R.string.notice),
String.format(getString(R.string.invalid_stun_server), newStunServer)) String.format(getString(R.string.invalid_stun_server), newStunServer))
return false return false
app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+1 -2
View File
@@ -125,8 +125,7 @@ object Utils {
} }
fun checkStunUri(uri: String): Boolean { fun checkStunUri(uri: String): Boolean {
if (!uri.startsWith("stun:") && !uri.startsWith("stuns:") && if (!uri.startsWith("stun:") && !uri.startsWith("turn:"))
!uri.startsWith("turn:") && !uri.startsWith("turns:"))
return false return false
return checkHostPort(uri.substringAfter(":")) return checkHostPort(uri.substringAfter(":"))
} }
app/src/main/res/values-fi/strings.xml
+2 -2
View File
@@ -131,8 +131,8 @@
</string> </string>
<string name="stun_server">STUN/TURN-palvelin</string> <string name="stun_server">STUN/TURN-palvelin</string>
<string name="stun_server_help">STUN/TURN-palvelimen muotoa \'kaava:palvelin[:portti]\' <string name="stun_server_help">STUN/TURN-palvelimen muotoa \'kaava:palvelin[:portti]\'
oleva URI, missä kaava on \'stun\', \'stuns\', \'turn\' tai \'turns\'. Oletus STUN-palvelin oleva URI, missä kaava on \'stun\' tai \'turn\'. Oletus STUN-palvelin
STUN ja ICE protokollille on \'stun:stun.l.google.com:19302\', joka osoittaa Google:n STUN- ja ICE-protokollille on \'stun:stun.l.google.com:19302\', joka osoittaa Google:n
julkiseen STUN-palvelimeen. TURN-palvelimella ei ole oletusarvoa. julkiseen STUN-palvelimeen. TURN-palvelimella ei ole oletusarvoa.
</string> </string>
<string name="stun_server_uri">STUN/TURN-palvelimen URI</string> <string name="stun_server_uri">STUN/TURN-palvelimen URI</string>
app/src/main/res/values/strings.xml
+1 -1
View File
@@ -126,7 +126,7 @@
</string> </string>
<string name="stun_server">STUN/TURN Server</string> <string name="stun_server">STUN/TURN Server</string>
<string name="stun_server_help">A STUN/TURN Server URI of form scheme:host[:port], where scheme <string name="stun_server_help">A STUN/TURN Server URI of form scheme:host[:port], where scheme
is \'stun\', \'stuns\', \'turn\', or \'turns\'. Factory default STUN Server for STUN and is \'stun\' or \'turn\'. Factory default STUN Server for STUN and
ICE protocols is \'stun:stun.l.google.com:19302\' pointing to public Google STUN server. ICE protocols is \'stun:stun.l.google.com:19302\' pointing to public Google STUN server.
There is no factory default TURN server. There is no factory default TURN server.
</string> </string>