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

Merge pull request #14966 from prlanzarin/u26-caustic-curfew

Browse Source 
feat(audio): add sipjsAllowMdns option to control mDNS filtering in SIP.js
This commit is contained in:
Paulo Lanzarin 2022-05-09 20:56:21 -03:00 committed by GitHub
commit 4f3fef37a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ const MEDIA_TAG = MEDIA.mediaTag;
const CALL_HANGUP_TIMEOUT = MEDIA.callHangupTimeout;
const CALL_HANGUP_MAX_RETRIES = MEDIA.callHangupMaximumRetries;
const SIPJS_HACK_VIA_WS = MEDIA.sipjsHackViaWs;
const SIPJS_ALLOW_MDNS = MEDIA.sipjsAllowMdns || false;
const IPV4_FALLBACK_DOMAIN = Meteor.settings.public.app.ipv4FallbackDomain;
const CALL_CONNECT_TIMEOUT = 20000;
const ICE_NEGOTIATION_TIMEOUT = 20000;
@ -761,6 +762,11 @@ class SIPSession {
const target = SIP.UserAgent.makeURI(`sip:${callExtension}@${hostname}`);
const matchConstraints = getAudioConstraints({ deviceId: this.inputDeviceId });
const iceModifiers = [
filterValidIceCandidates.bind(this, this.validIceCandidates),
];
if (!SIPJS_ALLOW_MDNS) iceModifiers.push(stripMDnsCandidates);
const inviterOptions = {
sessionDescriptionHandlerOptions: {
@ -772,10 +778,7 @@ class SIPSession {
},
iceGatheringTimeout: ICE_GATHERING_TIMEOUT,
},
sessionDescriptionHandlerModifiersPostICEGathering: [
stripMDnsCandidates,
filterValidIceCandidates.bind(this, this.validIceCandidates),
],
sessionDescriptionHandlerModifiersPostICEGathering: iceModifiers,
delegate: {
onSessionDescriptionHandler:
this.initSessionDescriptionHandler.bind(this),

3
bigbluebutton-html5/private/config/settings.yml
View File

@ -550,6 +550,9 @@ public:
# showing to the user there's an audio error.
audioReconnectionAttempts: 3
sipjsHackViaWs: false
# sipjsAllowMdns: whether mDNS candidates should be allowed in local SDPs.
# Default is false since FreeSWITCH doesn't resolve mDNS by default.
sipjsAllowMdns: false
# the fqdn of this host.
# If you run a traditional setup of multiple nodes behind scalelite and the users see the hostnames of the
# individual nodes, you can leave this at the default setting