Skip to content

Revert "Split reporting of candidates by protocol" #5236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Feb 22, 2021
Merged

Revert "Split reporting of candidates by protocol" #5236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Revert "Split reporting of candidates by protocol"
  • Loading branch information
@nickvergessen
nickvergessen authored Feb 22, 2021
commit 20929b35dab5de84877a98c0908cdf4e665d0ba3
40 changes: 13 additions & 27 deletions src/components/AdminSettings/TurnServer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ export default {
data() {
return {
testing: false,
testingErrorUDP: false,
testingErrorTCP: false,
testingError: false,
testingSuccess: false,
}
},
Expand All @@ -154,23 +153,17 @@ export default {
},
testIconClasses() {
return {
'icon-category-monitoring': !this.testing && !(this.testingErrorUDP || this.testingErrorTCP) && !this.testingSuccess,
'icon-category-monitoring': !this.testing && !this.testingError && !this.testingSuccess,
'icon-loading-small': this.testing,
'icon-error': this.testingErrorUDP || this.testingErrorTCP,
'icon-error': this.testingError,
'icon-checkmark': this.testingSuccess,
}
},
testResult() {
if (this.testingSuccess) {
return t('spreed', 'OK: Successful ICE candidates returned by the TURN server')
} else if (this.testingErrorUDP) {
if (this.testingErrorTCP) {
return t('spreed', 'Error: No working ICE candidates returned by the TURN server')
}

return t('spreed', 'Error: No working ICE candidates returned for UDP by the TURN server')
} else if (this.testingErrorTCP) {
return t('spreed', 'Error: No working ICE candidates returned for TCP by the TURN server')
} else if (this.testingError) {
return t('spreed', 'Error: No working ICE candidates returned by the TURN server')
} else if (this.testing) {
return t('spreed', 'Testing whether the TURN server returns ICE candidates')
}
Expand All @@ -180,8 +173,7 @@ export default {

mounted() {
this.testing = false
this.testingErrorUDP = false
this.testingErrorTCP = false
this.testingError = false
this.testingSuccess = false
},

Expand All @@ -192,8 +184,7 @@ export default {

testServer() {
this.testing = true
this.testingErrorUDP = false
this.testingErrorTCP = false
this.testingError = false
this.testingSuccess = false

const schemes = this.schemes.split(',')
Expand Down Expand Up @@ -265,22 +256,17 @@ export default {
notifyTurnResult(candidates, timeout) {
console.info('Received candidates', candidates)

const udpCandidates = candidates.filter((cand) => cand.type === 'relay' && cand.protocol === 'UDP')
const tcpCandidates = candidates.filter((cand) => cand.type === 'relay' && cand.protocol === 'TCP')
const types = candidates.map((cand) => cand.type)

this.testing = false
if (udpCandidates.length === 0 && this.protocols.indexOf('udp') !== -1) {
this.testingErrorUDP = true
if (types.indexOf('relay') === -1) {
this.testingError = true
} else {
this.testingSuccess = true
}
if (tcpCandidates.length === 0 && this.protocols.indexOf('tcp') !== -1) {
this.testingErrorTCP = true
}

this.testingSuccess = !(this.testingErrorUDP || this.testingErrorTCP)

setTimeout(() => {
this.testingErrorUDP = false
this.testingErrorTCP = false
this.testingError = false
this.testingSuccess = false
}, 30000)

Expand Down