fumiama/WireGold
1
0
Fork 0
mirror of https://github.com/fumiama/WireGold.git synced 2026-06-04 23:40:26 +08:00
Code Activity

optimize(orbyte): use manual destroy

Browse Source
This commit is contained in:
源文雨
2025-04-04 01:26:37 +09:00
parent 82c6136782
commit b5992574ec
16 changed files with 83 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
upper/services/tunnel/tunnel.go
View File

@@ -73,14 +73,14 @@ func (s *Tunnel) Read(p []byte) (int, error) {
d = s.outcache
} else {
pkt := <-s.out
if !pkt.D.HasInit() {
if len(pkt.D) == 0 {
return 0, io.EOF
}
if pkt.H.Size() < 4 {
logrus.Warnln("[tunnel] unexpected packet data len", pkt.H.Size(), "content", hex.EncodeToString(pkt.D.Trans()))
logrus.Warnln("[tunnel] unexpected packet data len", pkt.H.Size(), "content", hex.EncodeToString(pkt.D))
return 0, io.EOF
}
d = pkt.D.Trans()[4:]
d = pkt.D[4:]
}
if d != nil {
if len(p) >= len(d) {
@@ -157,23 +157,21 @@ func (s *Tunnel) handleRead() {
continue
}
p := s.l.Read()
if !p.D.HasInit() {
if len(p.D) == 0 {
logrus.Errorln("[tunnel] read recv nil")
break
}
end := 64
endl := "..."
if p.D.Len() < 64 {
end = p.D.Len()
if len(p.D) < 64 {
end = len(p.D)
endl = "."
}
var recvseq uint32
p.D.V(func(b []byte) {
if config.ShowDebugLog {
logrus.Debugln("[tunnel] read recv", hex.EncodeToString(b[:end]), endl)
}
recvseq = binary.LittleEndian.Uint32(b[:4])
})
if config.ShowDebugLog {
logrus.Debugln("[tunnel] read recv", hex.EncodeToString(p.D[:end]), endl)
}
recvseq = binary.LittleEndian.Uint32(p.D[:4])
if recvseq == seq {
if config.ShowDebugLog {
logrus.Debugln("[tunnel] dispatch seq", seq)

5
upper/services/tunnel/tunnel_test.go
View File

@@ -413,7 +413,10 @@ func (f logFormat) Format(entry *logrus.Entry) ([]byte, error) {
buf.WriteString(entry.Message)
buf.WriteString("\n")
return buf.ToBytes().Trans(), nil
b := buf.ToBytes().Copy()
buf.Destroy()
return b.Trans(), nil
}
const (