Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accept rtsp client without interleaved parameter #1511

Merged
merged 6 commits into from
Feb 18, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix: return 461 if client requested an invalid transport method
fmcloudconsulting authored Dec 17, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit fd125ecc683daf8f526673aca3ead91e53540e37
41 changes: 24 additions & 17 deletions pkg/rtsp/server.go
Original file line number Diff line number Diff line change
@@ -150,28 +150,35 @@ func (c *Conn) Accept() error {

const transport = "RTP/AVP/TCP;unicast"

c.session = core.RandString(8, 10)
c.state = StateSetup

if c.mode == core.ModePassiveConsumer {
if i := reqTrackID(req); i >= 0 && i < len(c.Senders) {
// mark sender as SETUP
c.Senders[i].Media.ID = MethodSetup
interleaved := fmt.Sprintf("%d-%d", i*2, i*2+1)
// Test if client requests unicast with TCP transport, otherwise return 461 Transport not supported
// 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

// Check if transport already contains the 'interleaved' parameter
if strings.Contains(transport, "interleaved=") {
// If so, just update the interleaved value
res.Header.Set("Transport", strings.Replace(transport, "interleaved=[^;]*", "interleaved="+interleaved, 1))
if c.mode == core.ModePassiveConsumer {
if i := reqTrackID(req); i >= 0 && i < len(c.Senders) {
// mark sender as SETUP
c.Senders[i].Media.ID = MethodSetup
interleaved := fmt.Sprintf("%d-%d", i*2, i*2+1)

// Check if transport already contains the 'interleaved' parameter
if strings.Contains(transport, "interleaved=") {
// If so, just update the interleaved value
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 {
// Otherwise, append the interleaved parameter
res.Header.Set("Transport", transport+";interleaved="+interleaved)
res.Status = "400 Bad Request"
}
} else {
res.Status = "400 Bad Request"
res.Header.Set("Transport", tr)
}
} else {
res.Header.Set("Transport", tr)
else {
res.Status = "461 Unsupported transport"
}

if err = c.WriteResponse(res); err != nil {