From 95117f0aa40ac608343e41f9a957840dd503a1c9 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Sat, 19 Feb 2022 22:20:01 +0100 Subject: [PATCH] server: rename Req field into Request --- pkg/liberrors/server.go | 4 ++-- server_test.go | 14 +++++++------- serverconn.go | 26 +++++++++++++------------- serverhandler.go | 28 ++++++++++++++-------------- serversession.go | 14 +++++++------- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/pkg/liberrors/server.go b/pkg/liberrors/server.go index b9020c02..a38497e0 100644 --- a/pkg/liberrors/server.go +++ b/pkg/liberrors/server.go @@ -50,12 +50,12 @@ func (e ErrServerCSeqMissing) Error() string { // ErrServerUnhandledRequest is an error that can be returned by a server. type ErrServerUnhandledRequest struct { - Req *base.Request + Request *base.Request } // Error implements the error interface. 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. diff --git a/server_test.go b/server_test.go index 6dc95ca9..20a075f4 100644 --- a/server_test.go +++ b/server_test.go @@ -303,7 +303,7 @@ func TestServerHighLevelPublishRead(t *testing.T) { if ctx.Path != "test/stream" { return &base.Response{ 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" { return &base.Response{ @@ -328,7 +328,7 @@ func TestServerHighLevelPublishRead(t *testing.T) { if ctx.Path != "test/stream" { return &base.Response{ StatusCode: base.StatusBadRequest, - }, fmt.Errorf("invalid path (%s)", ctx.Req.URL) + }, fmt.Errorf("invalid path (%s)", ctx.Request.URL) } if ctx.Query != "key=val" { return &base.Response{ @@ -356,7 +356,7 @@ func TestServerHighLevelPublishRead(t *testing.T) { if ctx.Path != "test/stream" { return &base.Response{ 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" { return &base.Response{ @@ -378,7 +378,7 @@ func TestServerHighLevelPublishRead(t *testing.T) { if ctx.Path != "test/stream" { return &base.Response{ StatusCode: base.StatusBadRequest, - }, fmt.Errorf("invalid path (%s)", ctx.Req.URL) + }, fmt.Errorf("invalid path (%s)", ctx.Request.URL) } if ctx.Query != "key=val" { return &base.Response{ @@ -394,7 +394,7 @@ func TestServerHighLevelPublishRead(t *testing.T) { if ctx.Path != "test/stream" { return &base.Response{ StatusCode: base.StatusBadRequest, - }, fmt.Errorf("invalid path (%s)", ctx.Req.URL) + }, fmt.Errorf("invalid path (%s)", ctx.Request.URL) } if ctx.Query != "key=val" { return &base.Response{ @@ -893,7 +893,7 @@ func TestServerGetSetParameter(t *testing.T) { s := &Server{ Handler: &testServerHandler{ onSetParameter: func(ctx *ServerHandlerOnSetParameterCtx) (*base.Response, error) { - params = ctx.Req.Body + params = ctx.Request.Body return &base.Response{ StatusCode: base.StatusOK, }, nil @@ -1259,7 +1259,7 @@ func TestServerAuth(t *testing.T) { s := &Server{ Handler: &testServerHandler{ onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { - err := authValidator.ValidateRequest(ctx.Req) + err := authValidator.ValidateRequest(ctx.Request) if err != nil { return &base.Response{ StatusCode: base.StatusUnauthorized, diff --git a/serverconn.go b/serverconn.go index 2885460f..c7473102 100644 --- a/serverconn.go +++ b/serverconn.go @@ -385,10 +385,10 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) { path, query := base.PathSplitQuery(pathAndQuery) res, stream, err := h.OnDescribe(&ServerHandlerOnDescribeCtx{ - Conn: sc, - Req: req, - Path: path, - Query: query, + Conn: sc, + Request: req, + Path: path, + Query: query, }) if res.StatusCode == base.StatusOK { @@ -472,10 +472,10 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) { path, query := base.PathSplitQuery(pathAndQuery) return h.OnGetParameter(&ServerHandlerOnGetParameterCtx{ - Conn: sc, - Req: req, - Path: path, - Query: query, + Conn: sc, + Request: req, + Path: path, + Query: query, }) } @@ -491,17 +491,17 @@ func (sc *ServerConn) handleRequest(req *base.Request) (*base.Response, error) { path, query := base.PathSplitQuery(pathAndQuery) return h.OnSetParameter(&ServerHandlerOnSetParameterCtx{ - Conn: sc, - Req: req, - Path: path, - Query: query, + Conn: sc, + Request: req, + Path: path, + Query: query, }) } } return &base.Response{ StatusCode: base.StatusBadRequest, - }, liberrors.ErrServerUnhandledRequest{Req: req} + }, liberrors.ErrServerUnhandledRequest{Request: req} } func (sc *ServerConn) handleRequestOuter(req *base.Request) error { diff --git a/serverhandler.go b/serverhandler.go index c69b37a3..2372d60e 100644 --- a/serverhandler.go +++ b/serverhandler.go @@ -65,10 +65,10 @@ type ServerHandlerOnResponse interface { // ServerHandlerOnDescribeCtx is the context of a DESCRIBE request. type ServerHandlerOnDescribeCtx struct { - Conn *ServerConn - Req *base.Request - Path string - Query string + Conn *ServerConn + Request *base.Request + Path string + Query string } // ServerHandlerOnDescribe can be implemented by a ServerHandler. @@ -81,7 +81,7 @@ type ServerHandlerOnAnnounceCtx struct { Server *Server Session *ServerSession Conn *ServerConn - Req *base.Request + Request *base.Request Path string Query string Tracks Tracks @@ -97,7 +97,7 @@ type ServerHandlerOnSetupCtx struct { Server *Server Session *ServerSession Conn *ServerConn - Req *base.Request + Request *base.Request Path string Query string TrackID int @@ -117,7 +117,7 @@ type ServerHandlerOnSetup interface { type ServerHandlerOnPlayCtx struct { Session *ServerSession Conn *ServerConn - Req *base.Request + Request *base.Request Path string Query string } @@ -131,7 +131,7 @@ type ServerHandlerOnPlay interface { type ServerHandlerOnRecordCtx struct { Session *ServerSession Conn *ServerConn - Req *base.Request + Request *base.Request Path string Query string } @@ -145,7 +145,7 @@ type ServerHandlerOnRecord interface { type ServerHandlerOnPauseCtx struct { Session *ServerSession Conn *ServerConn - Req *base.Request + Request *base.Request Path string Query string } @@ -159,7 +159,7 @@ type ServerHandlerOnPause interface { type ServerHandlerOnGetParameterCtx struct { Session *ServerSession Conn *ServerConn - Req *base.Request + Request *base.Request Path string Query string } @@ -171,10 +171,10 @@ type ServerHandlerOnGetParameter interface { // ServerHandlerOnSetParameterCtx is the context of a SET_PARAMETER request. type ServerHandlerOnSetParameterCtx struct { - Conn *ServerConn - Req *base.Request - Path string - Query string + Conn *ServerConn + Request *base.Request + Path string + Query string } // ServerHandlerOnSetParameter can be implemented by a ServerHandler. diff --git a/serversession.go b/serversession.go index 1fa62d8f..517a457d 100644 --- a/serversession.go +++ b/serversession.go @@ -538,7 +538,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base Server: ss.s, Session: ss, Conn: sc, - Req: req, + Request: req, Path: path, Query: query, Tracks: tracks, @@ -679,7 +679,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base Server: ss.s, Session: ss, Conn: sc, - Req: req, + Request: req, Path: path, Query: query, TrackID: trackID, @@ -841,7 +841,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base res, err := sc.s.Handler.(ServerHandlerOnPlay).OnPlay(&ServerHandlerOnPlayCtx{ Session: ss, Conn: sc, - Req: req, + Request: req, Path: path, Query: query, }) @@ -973,7 +973,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base res, err := ss.s.Handler.(ServerHandlerOnRecord).OnRecord(&ServerHandlerOnRecordCtx{ Session: ss, Conn: sc, - Req: req, + Request: req, Path: path, Query: query, }) @@ -1042,7 +1042,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base res, err := ss.s.Handler.(ServerHandlerOnPause).OnPause(&ServerHandlerOnPauseCtx{ Session: ss, Conn: sc, - Req: req, + Request: req, Path: path, Query: query, }) @@ -1125,7 +1125,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base return h.OnGetParameter(&ServerHandlerOnGetParameterCtx{ Session: ss, Conn: sc, - Req: req, + Request: req, Path: path, Query: query, }) @@ -1144,7 +1144,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base return &base.Response{ StatusCode: base.StatusBadRequest, - }, liberrors.ErrServerUnhandledRequest{Req: req} + }, liberrors.ErrServerUnhandledRequest{Request: req} } func (ss *ServerSession) runWriter() {