RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2025-02-21 14:06:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add query as optional block for SRT publish and read (#2656)

Browse Source
This commit is contained in:
Bohdan Cherniakh 2023-11-17 00:32:17 +02:00 committed by GitHub
parent 3277765851
commit 4fa6c16c85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/core/path_test.go
View File

@ -359,7 +359,7 @@ func TestPathRunOnRead(t *testing.T) {
case "srt":
conf := srt.DefaultConfig()
address, err := conf.UnmarshalURL("srt://localhost:8890?streamid=read:test")
address, err := conf.UnmarshalURL("srt://localhost:8890?streamid=read:test:query=value")
require.NoError(t, err)
err = conf.Validate()
@ -390,19 +390,11 @@ func TestPathRunOnRead(t *testing.T) {
byts, err := os.ReadFile(onReadFile)
require.NoError(t, err)
if ca == "srt" {
require.Equal(t, "test \n", string(byts))
} else {
require.Equal(t, "test query=value\n", string(byts))
}
require.Equal(t, "test query=value\n", string(byts))
byts, err = os.ReadFile(onUnreadFile)
require.NoError(t, err)
if ca == "srt" {
require.Equal(t, "test \n", string(byts))
} else {
require.Equal(t, "test query=value\n", string(byts))
}
require.Equal(t, "test query=value\n", string(byts))
})
}
}

32
internal/core/srt_conn.go
View File

@ -186,28 +186,38 @@ func (c *srtConn) runInner() error {
func (c *srtConn) runInner2(req srtNewConnReq) (bool, error) {
parts := strings.Split(req.connReq.StreamId(), ":")
if (len(parts) != 2 && len(parts) != 4) || (parts[0] != "read" && parts[0] != "publish") {
if (len(parts) < 2 || len(parts) > 5) || (parts[0] != "read" && parts[0] != "publish") {
return false, fmt.Errorf("invalid streamid '%s':"+
" it must be 'action:pathname' or 'action:pathname:user:pass', "+
"where action is either read or publish, pathname is the path name, user and pass are the credentials",
" it must be 'action:pathname[:query]' or 'action:pathname:user:pass[:query]', "+
"where action is either read or publish, pathname is the path name, user and pass are the credentials, "+
"query is an optional token containing additional information",
req.connReq.StreamId())
}
pathName := parts[1]
user := ""
pass := ""
query := ""
if len(parts) == 4 {
if len(parts) == 4 || len(parts) == 5 {
user, pass = parts[2], parts[3]
}
if parts[0] == "publish" {
return c.runPublish(req, pathName, user, pass)
if len(parts) == 3 {
query = parts[2]
}
return c.runRead(req, pathName, user, pass)
if len(parts) == 5 {
query = parts[4]
}
if parts[0] == "publish" {
return c.runPublish(req, pathName, user, pass, query)
}
return c.runRead(req, pathName, user, pass, query)
}
func (c *srtConn) runPublish(req srtNewConnReq, pathName string, user string, pass string) (bool, error) {
func (c *srtConn) runPublish(req srtNewConnReq, pathName string, user string, pass string, query string) (bool, error) {
res := c.pathManager.addPublisher(pathAddPublisherReq{
author: c,
accessRequest: pathAccessRequest{
@ -218,6 +228,7 @@ func (c *srtConn) runPublish(req srtNewConnReq, pathName string, user string, pa
pass: pass,
proto: authProtocolSRT,
id: &c.uuid,
query: query,
},
})
@ -305,7 +316,7 @@ func (c *srtConn) runPublishReader(sconn srt.Conn, path *path) error {
}
}
func (c *srtConn) runRead(req srtNewConnReq, pathName string, user string, pass string) (bool, error) {
func (c *srtConn) runRead(req srtNewConnReq, pathName string, user string, pass string, query string) (bool, error) {
res := c.pathManager.addReader(pathAddReaderReq{
author: c,
accessRequest: pathAccessRequest{
@ -315,6 +326,7 @@ func (c *srtConn) runRead(req srtNewConnReq, pathName string, user string, pass
pass: pass,
proto: authProtocolSRT,
id: &c.uuid,
query: query,
},
})
@ -368,7 +380,7 @@ func (c *srtConn) runRead(req srtNewConnReq, pathName string, user string, pass
pathConf,
res.path,
c.apiReaderDescribe(),
"",
query,
c,
)
defer onUnreadHook()