mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return errors from the loop in connect() rather than breaking.

This commit is contained in:
scruzin 2019-01-20 10:28:05 +10:30
parent efe40a6778
commit 89d9bf3eef
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rtmp/rtmp.go
View File

@ -192,14 +192,14 @@ func connect(c *Conn) error {
c.log(WarnLevel, pkg+"sendConnect failed", "error", err.Error()) c.log(WarnLevel, pkg+"sendConnect failed", "error", err.Error())
return err return err
} }
c.log(DebugLevel, pkg+"negotiating")
c.log(DebugLevel, pkg+"negotiating")
var buf [256]byte var buf [256]byte
for !c.isPlaying { for !c.isPlaying {
pkt := packet{buf: buf[:]} pkt := packet{buf: buf[:]}
err = pkt.readFrom(c) err = pkt.readFrom(c)
if err != nil { if err != nil {
break return err
} }
switch pkt.packetType { switch pkt.packetType {
@ -208,14 +208,10 @@ func connect(c *Conn) error {
default: default:
err = handlePacket(c, &pkt) err = handlePacket(c, &pkt)
if err != nil { if err != nil {
break return err
} }
} }
} }
if !c.isPlaying {
return err
}
return nil return nil
} }