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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Accept rtsp client without interleaved parameter #1511

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29f7f1a
feat: accept rtsp client without interleaved parameter
fmcloudconsulting Dec 16, 2024
fd125ec
fix: return 461 if client requested an invalid transport method
fmcloudconsulting Dec 17, 2024
d881755
chore: lint
fmcloudconsulting Dec 17, 2024
4b80b2c
fix: typo
fmcloudconsulting Dec 17, 2024
6fa352f
fix: don't require unicast param and fix typo (tr instead of transport)
fmcloudconsulting Dec 17, 2024
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
20 changes: 15 additions & 5 deletions pkg/rtsp/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,22 +148,32 @@ func (c *Conn) Accept() error {
Request: req,
}

const transport = "RTP/AVP/TCP;unicast;interleaved="
if tr = core.Between(tr, "interleaved=", ";"); tr != "" {
// Test if client requests 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, "RTP/AVP/TCP") {

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
tr = fmt.Sprintf("%d-%d", i*2, i*2+1)
res.Header.Set("Transport", transport+tr)
interleaved := fmt.Sprintf("%d-%d", i*2, i*2+1)

// Check if tr already contains the 'interleaved' parameter
if strings.Contains(tr, "interleaved=") {
// If so, just update the interleaved value
res.Header.Set("Transport", strings.Replace(tr, "interleaved=[^;]*", "interleaved="+interleaved, 1))
} else {
// Otherwise, append the interleaved parameter
res.Header.Set("Transport", tr+";interleaved="+interleaved)
}
} else {
res.Status = "400 Bad Request"
}
} else {
res.Header.Set("Transport", transport+tr)
res.Header.Set("Transport", tr)
}
} else {
res.Status = "461 Unsupported transport"
Expand Down