apps/go2rtc
1
0
Fork 0
mirror of https://github.com/AlexxIT/go2rtc.git synced 2025-09-27 04:36:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: return 461 if client requested an invalid transport method

Browse Source
This commit is contained in:
fmcloudconsulting
2024-12-17 17:28:13 +01:00
committed by GitHub
parent 29f7f1a57d
commit fd125ecc68
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
pkg/rtsp/server.go
View File

@@ -150,28 +150,35 @@ func (c *Conn) Accept() error {
const transport = "RTP/AVP/TCP;unicast" const transport = "RTP/AVP/TCP;unicast"
c.session = core.RandString(8, 10) // Test if client requests unicast with TCP transport, otherwise return 461 Transport not supported
c.state = StateSetup // This allows smart clients who initially requested UDP to fall back on TCP transport.
if strings.HasPrefix(tr, transport) {
c.session = core.RandString(8, 10)
c.state = StateSetup
if c.mode == core.ModePassiveConsumer { if c.mode == core.ModePassiveConsumer {
if i := reqTrackID(req); i >= 0 && i < len(c.Senders) { if i := reqTrackID(req); i >= 0 && i < len(c.Senders) {
// mark sender as SETUP // mark sender as SETUP
c.Senders[i].Media.ID = MethodSetup c.Senders[i].Media.ID = MethodSetup
interleaved := fmt.Sprintf("%d-%d", i*2, i*2+1) interleaved := fmt.Sprintf("%d-%d", i*2, i*2+1)
// Check if transport already contains the 'interleaved' parameter // Check if transport already contains the 'interleaved' parameter
if strings.Contains(transport, "interleaved=") { if strings.Contains(transport, "interleaved=") {
// If so, just update the interleaved value // If so, just update the interleaved value
res.Header.Set("Transport", strings.Replace(transport, "interleaved=[^;]*", "interleaved="+interleaved, 1)) res.Header.Set("Transport", strings.Replace(transport, "interleaved=[^;]*", "interleaved="+interleaved, 1))
} else {
// Otherwise, append the interleaved parameter
res.Header.Set("Transport", transport+";interleaved="+interleaved)
}
} else { } else {
// Otherwise, append the interleaved parameter res.Status = "400 Bad Request"
res.Header.Set("Transport", transport+";interleaved="+interleaved)
} }
} else { } else {
res.Status = "400 Bad Request" res.Header.Set("Transport", tr)
} }
} else { else {
res.Header.Set("Transport", tr) res.Status = "461 Unsupported transport"
} }
if err = c.WriteResponse(res); err != nil { if err = c.WriteResponse(res); err != nil {