Create data media sections for each requested

wdouglass · Sean-Der · commit abd6a3565475 · 2020-07-29T12:57:37.000-07:00
Don't create data media sections unless we're asked to Fixes #1349
diff --git a/peerconnection.go b/peerconnection.go
@@ -1856,7 +1856,9 @@ func (pc *PeerConnection) generateUnmatchedSDP(useIdentity bool) (*sdp.SessionDe
 		if len(audio) > 0 {
 			mediaSections = append(mediaSections, mediaSection{id: "audio", transceivers: audio})
 		}
-		mediaSections = append(mediaSections, mediaSection{id: "data", data: true})
+		for i := uint32(0); i < pc.sctpTransport.dataChannelsRequested; i++ {
+			mediaSections = append(mediaSections, mediaSection{id: pc.sctpTransport.dataChannels[i].label, data: true})
+		}
 	} else {
 		for _, t := range pc.GetTransceivers() {
 			if t.Sender() != nil {
@@ -1865,7 +1867,9 @@ func (pc *PeerConnection) generateUnmatchedSDP(useIdentity bool) (*sdp.SessionDe
 			mediaSections = append(mediaSections, mediaSection{id: t.Mid(), transceivers: []*RTPTransceiver{t}})
 		}
 
-		mediaSections = append(mediaSections, mediaSection{id: strconv.Itoa(len(mediaSections)), data: true})
+		for i := uint32(0); i < pc.sctpTransport.dataChannelsRequested; i++ {
+			mediaSections = append(mediaSections, mediaSection{id: strconv.Itoa(len(mediaSections)), data: true})
+		}
 	}
 
 	dtlsFingerprints, err := pc.configuration.Certificates[0].GetFingerprints()

Original file line number	Diff line number	Diff line change
`@@ -1856,7 +1856,9 @@ func (pc PeerConnection) generateUnmatchedSDP(useIdentity bool) (sdp.SessionDe`
`1856`	`1856`	`if len(audio) > 0 {`
`1857`	`1857`	`mediaSections = append(mediaSections, mediaSection{id: "audio", transceivers: audio})`
`1858`	`1858`	`}`
`1859`		`- mediaSections = append(mediaSections, mediaSection{id: "data", data: true})`
	`1859`	`+ for i := uint32(0); i < pc.sctpTransport.dataChannelsRequested; i++ {`
	`1860`	`+ mediaSections = append(mediaSections, mediaSection{id: pc.sctpTransport.dataChannels[i].label, data: true})`
	`1861`	`+ }`
`1860`	`1862`	`} else {`
`1861`	`1863`	`for _, t := range pc.GetTransceivers() {`
`1862`	`1864`	`if t.Sender() != nil {`
`@@ -1865,7 +1867,9 @@ func (pc PeerConnection) generateUnmatchedSDP(useIdentity bool) (sdp.SessionDe`
`1865`	`1867`	`mediaSections = append(mediaSections, mediaSection{id: t.Mid(), transceivers: []*RTPTransceiver{t}})`
`1866`	`1868`	`}`
`1867`	`1869`
`1868`		`- mediaSections = append(mediaSections, mediaSection{id: strconv.Itoa(len(mediaSections)), data: true})`
	`1870`	`+ for i := uint32(0); i < pc.sctpTransport.dataChannelsRequested; i++ {`
	`1871`	`+ mediaSections = append(mediaSections, mediaSection{id: strconv.Itoa(len(mediaSections)), data: true})`
	`1872`	`+ }`
`1869`	`1873`	`}`
`1870`	`1874`
`1871`	`1875`	`dtlsFingerprints, err := pc.configuration.Certificates[0].GetFingerprints()`