package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-05 15:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

ServerConn: add basePath argument to onSetup

Browse Source
This commit is contained in:
aler9
2021-01-17 20:02:40 +01:00
parent 0955b0b789
commit cc7afd6f35
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/server-tls.go
View File

@@ -74,7 +74,7 @@ func handleConn(conn *gortsplib.ServerConn) {
} }
// called after receiving a SETUP request. // called after receiving a SETUP request.
onSetup := func(req *base.Request, th *headers.Transport, trackID int) (*base.Response, error) { onSetup := func(req *base.Request, th *headers.Transport, basePath string, trackID int) (*base.Response, error) {
return &base.Response{ return &base.Response{
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
Header: base.Header{ Header: base.Header{

2
examples/server-udp.go
View File

@@ -73,7 +73,7 @@ func handleConn(conn *gortsplib.ServerConn) {
} }
// called after receiving a SETUP request. // called after receiving a SETUP request.
onSetup := func(req *base.Request, th *headers.Transport, trackID int) (*base.Response, error) { onSetup := func(req *base.Request, th *headers.Transport, basePath string, trackID int) (*base.Response, error) {
return &base.Response{ return &base.Response{
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
Header: base.Header{ Header: base.Header{

2
examples/server.go
View File

@@ -73,7 +73,7 @@ func handleConn(conn *gortsplib.ServerConn) {
} }
// called after receiving a SETUP request. // called after receiving a SETUP request.
onSetup := func(req *base.Request, th *headers.Transport, trackID int) (*base.Response, error) { onSetup := func(req *base.Request, th *headers.Transport, basePath string, trackID int) (*base.Response, error) {
return &base.Response{ return &base.Response{
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
Header: base.Header{ Header: base.Header{

2
serverconf_test.go
View File

@@ -142,7 +142,7 @@ func (ts *testServ) handleConn(conn *ServerConn) {
}, nil }, nil
} }
onSetup := func(req *base.Request, th *headers.Transport, trackID int) (*base.Response, error) { onSetup := func(req *base.Request, th *headers.Transport, basePath string, trackID int) (*base.Response, error) {
return &base.Response{ return &base.Response{
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
Header: base.Header{ Header: base.Header{

6
serverconn.go
View File

@@ -105,7 +105,7 @@ type ServerConnReadHandlers struct {
OnAnnounce func(req *base.Request, tracks Tracks) (*base.Response, error) OnAnnounce func(req *base.Request, tracks Tracks) (*base.Response, error)
// called after receiving a SETUP request. // called after receiving a SETUP request.
OnSetup func(req *base.Request, th *headers.Transport, trackID int) (*base.Response, error) OnSetup func(req *base.Request, th *headers.Transport, basePath string, trackID int) (*base.Response, error)
// called after receiving a PLAY request. // called after receiving a PLAY request.
OnPlay func(req *base.Request) (*base.Response, error) OnPlay func(req *base.Request) (*base.Response, error)
@@ -457,7 +457,7 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) {
}, err }, err
} }
_, controlPath, ok := req.URL.BasePathControlAttr() basePath, controlPath, ok := req.URL.BasePathControlAttr()
if !ok { if !ok {
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,
@@ -541,7 +541,7 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) {
} }
} }
res, err := sc.readHandlers.OnSetup(req, th, trackID) res, err := sc.readHandlers.OnSetup(req, th, basePath, trackID)
if res.StatusCode == 200 { if res.StatusCode == 200 {
sc.tracksProtocol = &th.Protocol sc.tracksProtocol = &th.Protocol