refatcor: remove ToBytes

This commit is contained in:
langhuihui
2024-06-07 18:24:21 +08:00
parent 523baa0f92
commit 68a7edf678
2 changed files with 7 additions and 11 deletions
+1 -9
View File
@@ -296,12 +296,4 @@ func (reader *MemoryReader) ClipFront() (r net.Buffers) {
reader.offset0 = 0
reader.offset1 = 0
return
}
func (buffers *Memory) ToBytes() []byte {
ret := make([]byte, buffers.Size)
var clone net.Buffers
clone = append(clone, buffers.Buffers...)
clone.Read(ret)
return ret
}
}
+6 -2
View File
@@ -120,8 +120,12 @@ func (nc *NetConnection) simple_handshake(C1 []byte, checkC2 bool) error {
if err != nil {
return err
}
if checkC2 && !bytes.Equal(C2.ToBytes()[8:], S0S1[9:]) {
return errors.New("C2 Error")
if checkC2 {
buf := nc.mediaDataPool.NextN(C2.Size)
C2.Read(buf)
if !bytes.Equal(buf[8:], S0S1[9:]) {
return errors.New("C2 Error")
}
}
return nil
}