apps/monibuca
1
0
Fork 0
mirror of https://github.com/langhuihui/monibuca.git synced 2025-10-22 06:59:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify code

Browse Source
This commit is contained in:
langhuihui
2024-04-15 19:28:14 +08:00
parent d06d068f99
commit 40c37c096a
12 changed files with 157 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/rtmp/pkg/handshake.go
View File

@@ -67,14 +67,14 @@ var (
// C2 S2 : 参考C1 S1
func (nc *NetConnection) ReadBuf(length int) (buf []byte, err error) {
buf = nc.ByteChunkPool.Malloc(length)
buf = nc.ReadPool.Malloc(length)
_, err = io.ReadFull(nc.Reader, buf)
return
}
func (nc *NetConnection) Handshake() error {
C0C1, err := nc.ReadBuf(C1S1_SIZE + 1)
defer nc.ByteChunkPool.Free(C0C1)
defer nc.ReadPool.Free(C0C1)
if err != nil {
return err
}
@@ -96,8 +96,8 @@ func (nc *NetConnection) Handshake() error {
}
func (client *NetConnection) ClientHandshake() (err error) {
C0C1 := client.ByteChunkPool.Malloc(C1S1_SIZE + 1)
defer client.ByteChunkPool.Free(C0C1)
C0C1 := client.ReadPool.Malloc(C1S1_SIZE + 1)
defer client.ReadPool.Free(C0C1)
C0C1[0] = RTMP_HANDSHAKE_VERSION
if _, err = client.Write(C0C1); err == nil {
// read S0 S1
@@ -114,15 +114,15 @@ func (client *NetConnection) ClientHandshake() (err error) {
}
func (nc *NetConnection) simple_handshake(C1 []byte) error {
S0S1 := nc.ByteChunkPool.Malloc(C1S1_SIZE + 1)
S0S1 := nc.ReadPool.Malloc(C1S1_SIZE + 1)
S0S1[0] = RTMP_HANDSHAKE_VERSION
util.PutBE(S0S1[1:5], time.Now().Unix()&0xFFFFFFFF)
copy(S0S1[5:], "Monibuca")
nc.Write(S0S1)
nc.Write(C1) // S2
defer nc.ByteChunkPool.Free(S0S1)
defer nc.ReadPool.Free(S0S1)
C2, err := nc.ReadBuf(C1S1_SIZE)
defer nc.ByteChunkPool.Free(C2)
defer nc.ReadPool.Free(C2)
if err != nil {
return err
}
@@ -182,7 +182,7 @@ func (nc *NetConnection) complex_handshake(C1 []byte) error {
buffer := net.Buffers{[]byte{RTMP_HANDSHAKE_VERSION}, S1, S2_Random, S2_Digest}
buffer.WriteTo(nc)
b, _ := nc.ReadBuf(1536)
nc.ByteChunkPool.Free(b)
nc.ReadPool.Free(b)
return nil
}