BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10873 from mariogasparoni/v2.2.x-release

Browse Source 
Do not trigger reconnect when ICE connection terminates before hanging up process is finished
This commit is contained in:
Fred Dixon 2020-11-20 07:43:14 -05:00 committed by GitHub
commit eba0058bac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bigbluebutton-html5/imports/api/audio/client/bridge/sip.js
View File

@ -145,13 +145,10 @@ class SIPSession {
sessionToken, sessionToken,
} = this.user; } = this.user;
const encodedName =
btoa && name ? btoa(name) : name;
const callerIdName = [ const callerIdName = [
`${userId}_${getAudioSessionNumber()}`, `${userId}_${getAudioSessionNumber()}`,
'bbbID', 'bbbID',
isListenOnly ? `LISTENONLY-${encodedName}` : encodedName, isListenOnly ? `LISTENONLY-${name}` : name,
].join('-').replace(/"/g, "'"); ].join('-').replace(/"/g, "'");
this.user.callerIdName = callerIdName; this.user.callerIdName = callerIdName;
@ -746,7 +743,7 @@ class SIPSession {
callerIdName: this.user.callerIdName, callerIdName: this.user.callerIdName,
}, },
}, 'ICE connection closed'); }, 'ICE connection closed');
} } else return;
this.callback({ this.callback({
status: this.baseCallStates.failed, status: this.baseCallStates.failed,

7
bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx
View File

@ -1,7 +1,6 @@
import React from 'react'; import React from 'react';
import { withTracker } from 'meteor/react-meteor-data'; import { withTracker } from 'meteor/react-meteor-data';
import VoiceUsers from '/imports/api/voice-users'; import VoiceUsers from '/imports/api/voice-users';
import Users from '/imports/api/users'
import Auth from '/imports/ui/services/auth'; import Auth from '/imports/ui/services/auth';
import { debounce } from 'lodash'; import { debounce } from 'lodash';
import TalkingIndicator from './component'; import TalkingIndicator from './component';
@ -38,16 +37,12 @@ export default withTracker(() => {
callerName, talking, color, voiceUserId, muted, intId, callerName, talking, color, voiceUserId, muted, intId,
} = usersTalking[i]; } = usersTalking[i];
const user = Users.findOne({ userId: voiceUserId }, { fields: { name: 1 } });
const _name = user ? user.name : 'USER';
talkers[`${intId}`] = { talkers[`${intId}`] = {
color, color,
talking, talking,
voiceUserId, voiceUserId,
muted, muted,
callerName: _name, callerName,
}; };
} }
} }