package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-21 06:09:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

add ClientConf.OnRequest, ClientConf.OnResponse

Browse Source
This commit is contained in:
aler9
2020-12-08 11:54:38 +01:00
parent eb7ebc5543
commit 07aefbcd5d
8 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
clientconn.go
View File

@@ -63,7 +63,7 @@ func (s clientConnState) String() string {
// ClientConn is a client-side RTSP connection.
type ClientConn struct {
c ClientConf
conf ClientConf
nconn net.Conn
br *bufio.Reader
bw *bufio.Writer
@@ -146,7 +146,7 @@ func (c *ClientConn) Tracks() Tracks {
}
func (c *ClientConn) readFrameTCPOrResponse() (interface{}, error) {
c.nconn.SetReadDeadline(time.Now().Add(c.c.ReadTimeout))
c.nconn.SetReadDeadline(time.Now().Add(c.conf.ReadTimeout))
f := base.InterleavedFrame{
Content: c.tcpFrameBuffer.Next(),
}
@@ -175,7 +175,11 @@ func (c *ClientConn) Do(req *base.Request) (*base.Response, error) {
c.cseq++
req.Header["CSeq"] = base.HeaderValue{strconv.FormatInt(int64(c.cseq), 10)}
c.nconn.SetWriteDeadline(time.Now().Add(c.c.WriteTimeout))
if c.conf.OnRequest != nil {
c.conf.OnRequest(req)
}
c.nconn.SetWriteDeadline(time.Now().Add(c.conf.WriteTimeout))
err := req.Write(c.bw)
if err != nil {
return nil, err
@@ -205,6 +209,10 @@ func (c *ClientConn) Do(req *base.Request) (*base.Response, error) {
return nil, err
}
if c.conf.OnResponse != nil {
c.conf.OnResponse(res)
}
// get session from response
if v, ok := res.Header["Session"]; ok {
sx, err := headers.ReadSession(v)
@@ -298,7 +306,7 @@ func (c *ClientConn) Describe(u *base.URL) (Tracks, *base.Response, error) {
if res.StatusCode != base.StatusOK {
// redirect
if !c.c.RedirectDisable &&
if !c.conf.RedirectDisable &&
res.StatusCode >= base.StatusMovedPermanently &&
res.StatusCode <= base.StatusUseProxy &&
len(res.Header["Location"]) == 1 {
@@ -310,7 +318,7 @@ func (c *ClientConn) Describe(u *base.URL) (Tracks, *base.Response, error) {
return nil, nil, err
}
nc, err := c.c.Dial(u.Host)
nc, err := c.conf.Dial(u.Host)
if err != nil {
return nil, nil, err
}
@@ -385,8 +393,8 @@ func (c *ClientConn) Setup(mode headers.TransportMode, track *Track,
}
// protocol set by conf
if c.c.StreamProtocol != nil {
return *c.c.StreamProtocol
if c.conf.StreamProtocol != nil {
return *c.conf.StreamProtocol
}
// try udp
@@ -493,7 +501,7 @@ func (c *ClientConn) Setup(mode headers.TransportMode, track *Track,
// switch protocol automatically
if res.StatusCode == base.StatusUnsupportedTransport &&
c.streamProtocol == nil &&
c.c.StreamProtocol == nil {
c.conf.StreamProtocol == nil {
v := StreamProtocolTCP
c.streamProtocol = &v