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

server: rename Req field into Request

Browse Source
This commit is contained in:
aler9
2022-02-19 22:20:01 +01:00
parent d7f6567e20
commit 95117f0aa4
5 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/liberrors/server.go
View File

@@ -50,12 +50,12 @@ func (e ErrServerCSeqMissing) Error() string {
// ErrServerUnhandledRequest is an error that can be returned by a server. // ErrServerUnhandledRequest is an error that can be returned by a server.
type ErrServerUnhandledRequest struct { type ErrServerUnhandledRequest struct {
Req *base.Request Request *base.Request
} }
// Error implements the error interface. // Error implements the error interface.
func (e ErrServerUnhandledRequest) Error() string { func (e ErrServerUnhandledRequest) Error() string {
return fmt.Sprintf("unhandled request: %v %v", e.Req.Method, e.Req.URL) return fmt.Sprintf("unhandled request: %v %v", e.Request.Method, e.Request.URL)
} }
// ErrServerInvalidState is an error that can be returned by a server. // ErrServerInvalidState is an error that can be returned by a server.

14
server_test.go
View File

@@ -303,7 +303,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
if ctx.Path != "test/stream" { if ctx.Path != "test/stream" {
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,
}, nil, fmt.Errorf("invalid path (%s)", ctx.Req.URL) }, nil, fmt.Errorf("invalid path (%s)", ctx.Request.URL)
} }
if ctx.Query != "key=val" { if ctx.Query != "key=val" {
return &base.Response{ return &base.Response{
@@ -328,7 +328,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
if ctx.Path != "test/stream" { if ctx.Path != "test/stream" {
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,
}, fmt.Errorf("invalid path (%s)", ctx.Req.URL) }, fmt.Errorf("invalid path (%s)", ctx.Request.URL)
} }
if ctx.Query != "key=val" { if ctx.Query != "key=val" {
return &base.Response{ return &base.Response{
@@ -356,7 +356,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
if ctx.Path != "test/stream" { if ctx.Path != "test/stream" {
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,
}, nil, fmt.Errorf("invalid path (%s)", ctx.Req.URL) }, nil, fmt.Errorf("invalid path (%s)", ctx.Request.URL)
} }
if ctx.Query != "key=val" { if ctx.Query != "key=val" {
return &base.Response{ return &base.Response{
@@ -378,7 +378,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
if ctx.Path != "test/stream" { if ctx.Path != "test/stream" {
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,
}, fmt.Errorf("invalid path (%s)", ctx.Req.URL) }, fmt.Errorf("invalid path (%s)", ctx.Request.URL)
} }
if ctx.Query != "key=val" { if ctx.Query != "key=val" {
return &base.Response{ return &base.Response{
@@ -394,7 +394,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
if ctx.Path != "test/stream" { if ctx.Path != "test/stream" {
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,
}, fmt.Errorf("invalid path (%s)", ctx.Req.URL) }, fmt.Errorf("invalid path (%s)", ctx.Request.URL)
} }
if ctx.Query != "key=val" { if ctx.Query != "key=val" {
return &base.Response{ return &base.Response{
@@ -893,7 +893,7 @@ func TestServerGetSetParameter(t *testing.T) {
s := &Server{ s := &Server{
Handler: &testServerHandler{ Handler: &testServerHandler{
onSetParameter: func(ctx *ServerHandlerOnSetParameterCtx) (*base.Response, error) { onSetParameter: func(ctx *ServerHandlerOnSetParameterCtx) (*base.Response, error) {
params = ctx.Req.Body params = ctx.Request.Body
return &base.Response{ return &base.Response{
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
}, nil }, nil
@@ -1259,7 +1259,7 @@ func TestServerAuth(t *testing.T) {
s := &Server{ s := &Server{
Handler: &testServerHandler{ Handler: &testServerHandler{
onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) {
err := authValidator.ValidateRequest(ctx.Req) err := authValidator.ValidateRequest(ctx.Request)
if err != nil { if err != nil {
return &base.Response{ return &base.Response{
StatusCode: base.StatusUnauthorized, StatusCode: base.StatusUnauthorized,

26
serverconn.go
View File

@@ -385,10 +385,10 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) {
path, query := base.PathSplitQuery(pathAndQuery) path, query := base.PathSplitQuery(pathAndQuery)
res, stream, err := h.OnDescribe(&ServerHandlerOnDescribeCtx{ res, stream, err := h.OnDescribe(&ServerHandlerOnDescribeCtx{
Conn: sc, Conn: sc,
Req: req, Request: req,
Path: path, Path: path,
Query: query, Query: query,
}) })
if res.StatusCode == base.StatusOK { if res.StatusCode == base.StatusOK {
@@ -472,10 +472,10 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) {
path, query := base.PathSplitQuery(pathAndQuery) path, query := base.PathSplitQuery(pathAndQuery)
return h.OnGetParameter(&ServerHandlerOnGetParameterCtx{ return h.OnGetParameter(&ServerHandlerOnGetParameterCtx{
Conn: sc, Conn: sc,
Req: req, Request: req,
Path: path, Path: path,
Query: query, Query: query,
}) })
} }
@@ -491,17 +491,17 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) {
path, query := base.PathSplitQuery(pathAndQuery) path, query := base.PathSplitQuery(pathAndQuery)
return h.OnSetParameter(&ServerHandlerOnSetParameterCtx{ return h.OnSetParameter(&ServerHandlerOnSetParameterCtx{
Conn: sc, Conn: sc,
Req: req, Request: req,
Path: path, Path: path,
Query: query, Query: query,
}) })
} }
} }
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,
}, liberrors.ErrServerUnhandledRequest{Req: req} }, liberrors.ErrServerUnhandledRequest{Request: req}
} }
func (sc *ServerConn) handleRequestOuter(req *base.Request) error { func (sc *ServerConn) handleRequestOuter(req *base.Request) error {

28
serverhandler.go
View File

@@ -65,10 +65,10 @@ type ServerHandlerOnResponse interface {
// ServerHandlerOnDescribeCtx is the context of a DESCRIBE request. // ServerHandlerOnDescribeCtx is the context of a DESCRIBE request.
type ServerHandlerOnDescribeCtx struct { type ServerHandlerOnDescribeCtx struct {
Conn *ServerConn Conn *ServerConn
Req *base.Request Request *base.Request
Path string Path string
Query string Query string
} }
// ServerHandlerOnDescribe can be implemented by a ServerHandler. // ServerHandlerOnDescribe can be implemented by a ServerHandler.
@@ -81,7 +81,7 @@ type ServerHandlerOnAnnounceCtx struct {
Server *Server Server *Server
Session *ServerSession Session *ServerSession
Conn *ServerConn Conn *ServerConn
Req *base.Request Request *base.Request
Path string Path string
Query string Query string
Tracks Tracks Tracks Tracks
@@ -97,7 +97,7 @@ type ServerHandlerOnSetupCtx struct {
Server *Server Server *Server
Session *ServerSession Session *ServerSession
Conn *ServerConn Conn *ServerConn
Req *base.Request Request *base.Request
Path string Path string
Query string Query string
TrackID int TrackID int
@@ -117,7 +117,7 @@ type ServerHandlerOnSetup interface {
type ServerHandlerOnPlayCtx struct { type ServerHandlerOnPlayCtx struct {
Session *ServerSession Session *ServerSession
Conn *ServerConn Conn *ServerConn
Req *base.Request Request *base.Request
Path string Path string
Query string Query string
} }
@@ -131,7 +131,7 @@ type ServerHandlerOnPlay interface {
type ServerHandlerOnRecordCtx struct { type ServerHandlerOnRecordCtx struct {
Session *ServerSession Session *ServerSession
Conn *ServerConn Conn *ServerConn
Req *base.Request Request *base.Request
Path string Path string
Query string Query string
} }
@@ -145,7 +145,7 @@ type ServerHandlerOnRecord interface {
type ServerHandlerOnPauseCtx struct { type ServerHandlerOnPauseCtx struct {
Session *ServerSession Session *ServerSession
Conn *ServerConn Conn *ServerConn
Req *base.Request Request *base.Request
Path string Path string
Query string Query string
} }
@@ -159,7 +159,7 @@ type ServerHandlerOnPause interface {
type ServerHandlerOnGetParameterCtx struct { type ServerHandlerOnGetParameterCtx struct {
Session *ServerSession Session *ServerSession
Conn *ServerConn Conn *ServerConn
Req *base.Request Request *base.Request
Path string Path string
Query string Query string
} }
@@ -171,10 +171,10 @@ type ServerHandlerOnGetParameter interface {
// ServerHandlerOnSetParameterCtx is the context of a SET_PARAMETER request. // ServerHandlerOnSetParameterCtx is the context of a SET_PARAMETER request.
type ServerHandlerOnSetParameterCtx struct { type ServerHandlerOnSetParameterCtx struct {
Conn *ServerConn Conn *ServerConn
Req *base.Request Request *base.Request
Path string Path string
Query string Query string
} }
// ServerHandlerOnSetParameter can be implemented by a ServerHandler. // ServerHandlerOnSetParameter can be implemented by a ServerHandler.

14
serversession.go
View File

@@ -538,7 +538,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
Server: ss.s, Server: ss.s,
Session: ss, Session: ss,
Conn: sc, Conn: sc,
Req: req, Request: req,
Path: path, Path: path,
Query: query, Query: query,
Tracks: tracks, Tracks: tracks,
@@ -679,7 +679,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
Server: ss.s, Server: ss.s,
Session: ss, Session: ss,
Conn: sc, Conn: sc,
Req: req, Request: req,
Path: path, Path: path,
Query: query, Query: query,
TrackID: trackID, TrackID: trackID,
@@ -841,7 +841,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
res, err := sc.s.Handler.(ServerHandlerOnPlay).OnPlay(&ServerHandlerOnPlayCtx{ res, err := sc.s.Handler.(ServerHandlerOnPlay).OnPlay(&ServerHandlerOnPlayCtx{
Session: ss, Session: ss,
Conn: sc, Conn: sc,
Req: req, Request: req,
Path: path, Path: path,
Query: query, Query: query,
}) })
@@ -973,7 +973,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
res, err := ss.s.Handler.(ServerHandlerOnRecord).OnRecord(&ServerHandlerOnRecordCtx{ res, err := ss.s.Handler.(ServerHandlerOnRecord).OnRecord(&ServerHandlerOnRecordCtx{
Session: ss, Session: ss,
Conn: sc, Conn: sc,
Req: req, Request: req,
Path: path, Path: path,
Query: query, Query: query,
}) })
@@ -1042,7 +1042,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
res, err := ss.s.Handler.(ServerHandlerOnPause).OnPause(&ServerHandlerOnPauseCtx{ res, err := ss.s.Handler.(ServerHandlerOnPause).OnPause(&ServerHandlerOnPauseCtx{
Session: ss, Session: ss,
Conn: sc, Conn: sc,
Req: req, Request: req,
Path: path, Path: path,
Query: query, Query: query,
}) })
@@ -1125,7 +1125,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
return h.OnGetParameter(&ServerHandlerOnGetParameterCtx{ return h.OnGetParameter(&ServerHandlerOnGetParameterCtx{
Session: ss, Session: ss,
Conn: sc, Conn: sc,
Req: req, Request: req,
Path: path, Path: path,
Query: query, Query: query,
}) })
@@ -1144,7 +1144,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,
}, liberrors.ErrServerUnhandledRequest{Req: req} }, liberrors.ErrServerUnhandledRequest{Request: req}
} }
func (ss *ServerSession) runWriter() { func (ss *ServerSession) runWriter() {