kunmeng/vdk
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'deepch:master' into master

Browse Source
This commit is contained in:
yunfan 2023-03-14 09:41:14 +08:00 committed by GitHub
commit 2c546deb84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
format/rtmp/rtmp.go
View File

@ -1623,20 +1623,15 @@ func (self *Conn) handshakeServer() (err error) {
clitime := pio.U32BE(C1[0:4]) clitime := pio.U32BE(C1[0:4])
srvtime := clitime srvtime := clitime
srvver := uint32(0x0d0e0a0d) srvver := uint32(0x0d0e0a0d)
cliver := pio.U32BE(C1[4:8])
if cliver != 0 {
var ok bool var ok bool
var digest []byte var digest []byte
if ok, digest = hsParse1(C1, hsClientPartialKey, hsServerFullKey); !ok { if ok, digest = hsParse1(C1, hsClientPartialKey, hsServerFullKey); ok {
err = fmt.Errorf("rtmp: handshake server: C1 invalid")
return
}
hsCreate01(S0S1, srvtime, srvver, hsServerPartialKey) hsCreate01(S0S1, srvtime, srvver, hsServerPartialKey)
hsCreate2(S2, digest) hsCreate2(S2, digest)
} else { } else {
copy(S1, C1) copy(S1, C2)
copy(S2, C2) copy(S2, C1)
} }
if _, err = self.bufw.Write(S0S1S2); err != nil { if _, err = self.bufw.Write(S0S1S2); err != nil {