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

Changed name of handShake to C_HandShake

This commit is contained in:
saxon 2018-08-07 12:24:25 +09:30
parent 9df51d1bd1
commit a04647fb3b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtmp/rtmp.go
View File

@ -739,7 +739,7 @@ func C_RTMP_Connect1(r *C.RTMP, cp *C.RTMPPacket) int {
log.Println("... connected, handshaking...") log.Println("... connected, handshaking...")
} }
//if C.HandShake(r, 1) == 0 { //if C.HandShake(r, 1) == 0 {
if handShake(r, 1) == 0 { if C_HandShake(r, 1) == 0 {
log.Println("C_RTMP_Connect1: handshake failed!") log.Println("C_RTMP_Connect1: handshake failed!")
return 0 return 0
} }
@ -754,7 +754,7 @@ func C_RTMP_Connect1(r *C.RTMP, cp *C.RTMPPacket) int {
return 1 return 1
} }
func handShake(r *C.RTMP, FP9HandShake int32) int { func C_HandShake(r *C.RTMP, FP9HandShake int32) int {
var bMatch int var bMatch int
//uptime := uint32(0) //uptime := uint32(0)
//suptime := uint32(0) //suptime := uint32(0)
@ -789,10 +789,10 @@ func handShake(r *C.RTMP, FP9HandShake int32) int {
} }
if debugMode { if debugMode {
log.Println("handShake: Type answer: %v", typ) log.Println("C_HandShake: Type answer: %v", typ)
} }
if typ != clientbuf[0] { if typ != clientbuf[0] {
log.Println("handShake: type mismatch: client sent %v, server sent: %v", log.Println("C_HandShake: type mismatch: client sent %v, server sent: %v",
clientbuf[0], typ) clientbuf[0], typ)
} }
if readN(r, (*byte)(unsafe.Pointer(&serversig[0])), RTMP_SIG_SIZE) != RTMP_SIG_SIZE { if readN(r, (*byte)(unsafe.Pointer(&serversig[0])), RTMP_SIG_SIZE) != RTMP_SIG_SIZE {