Skip to content
This repository has been archived by the owner on Mar 1, 2024. It is now read-only.

Use mediasoup's internal stream ids for SCTP to avoid clashes #129

Merged
merged 1 commit into from
Feb 28, 2023
Merged

Use mediasoup's internal stream ids for SCTP to avoid clashes #129

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
34 changes: 7 additions & 27 deletions SFU/sfu_server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,7 @@ async function onStreamerOffer(sdp) {
}

function getNextStreamerSCTPId() {
if(!streamer){
throw new TypeError('Cannot generate an SCTP stream id - streamer was null.');
}
if (!streamer.transport || !streamer.transport.sctpParameters || typeof streamer.transport.sctpParameters.MIS !== 'number') {
throw new TypeError('Streamer was not setup with the following require properties: streamer.transport.sctpParameters.MIS');
}
const numStreams = streamer.transport.sctpParameters.MIS;
if (!streamer.dataStreamIds){
streamer.dataStreamIds = Buffer.alloc(numStreams, 0);
}
if (!streamer.nextDataStreamId) {
streamer.nextDataStreamId = 0;
}

let sctpStreamId;
for (let idx = streamer.nextDataStreamId; idx < streamer.dataStreamIds.length; ++idx) {
sctpStreamId = idx % streamer.dataStreamIds.length;
if (!streamer.dataStreamIds[sctpStreamId]) {
streamer.nextDataStreamId = sctpStreamId + 1;
return sctpStreamId;
}
}
console.error("No available SCTP ids, they are all allocated.");
return -1;
return streamer.transport._getNextSctpStreamId();
}

function onStreamerDisconnected() {
Expand Down Expand Up @@ -156,6 +133,9 @@ async function setupPeerDataChannels(peerId) {
// streamer data consumer (consumes peer data)
peer.streamerDataConsumer = await streamer.transport.consumeData({ dataProducerId: peer.peerDataProducer.id });

streamer.transport._sctpStreamIds[nextStreamerSCTPStreamId] = 1;
streamer.transport._sctpStreamIds[nextPeerSCTPStreamId] = 1;

const peerSignal = {
type: 'peerDataChannels',
playerId: peerId,
Expand Down Expand Up @@ -217,11 +197,11 @@ function onPeerDisconnected(peerId) {
}
if(peer.streamerDataConsumer){
// Set the streamer sctp id we generated back to zero indicating it can be reused.
if(streamer && streamer.dataStreamIds){
if(streamer && streamer.transport && streamer.transport._sctpStreamIds){
const allocatedStreamId = peer.streamerDataProducer.sctpStreamParameters.streamId;
const allocatedPeerStreamId = peer.peerDataProducer.sctpStreamParameters.streamId;
streamer.dataStreamIds[allocatedStreamId] = 0;
streamer.dataStreamIds[allocatedPeerStreamId] = 0;
streamer.transport._sctpStreamIds[allocatedStreamId] = 0;
streamer.transport._sctpStreamIds[allocatedPeerStreamId] = 0;
}
peer.streamerDataConsumer.close();
peer.streamerDataProducer.close();
Expand Down