diff --git a/.golangci.yml b/.golangci.yml index ca6c686..27694b3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -4,8 +4,8 @@ linters-settings: ignoretests: true exclude-functions: - (*os.File).Write - - (*github.com/fumiama/WireGold/bin.Writer).Write - - (*github.com/fumiama/WireGold/bin.Writer).WriteByte + - (*github.com/fumiama/WireGold/internal/bin.Writer).Write + - (*github.com/fumiama/WireGold/internal/bin.Writer).WriteByte - (*github.com/fumiama/WireGold/upper/services/tunnel.Tunnel).Write - (*github.com/fumiama/WireGold/upper/services/tunnel.Tunnel).Read diff --git a/config/global.go b/config/global.go index df62328..4bcfe7d 100644 --- a/config/global.go +++ b/config/global.go @@ -1,3 +1,3 @@ package config -const ShowDebugLog = true +const ShowDebugLog = false diff --git a/gold/head/builder.go b/gold/head/builder.go index c05839e..5826465 100644 --- a/gold/head/builder.go +++ b/gold/head/builder.go @@ -95,11 +95,11 @@ func (pb *DataBuilder) Zstd() *DataBuilder { } func (pb *DataBuilder) Hash() *DataBuilder { - return (*DataBuilder)(pb.p(func(ub *PacketBuf) { + return pb.p(func(ub *PacketBuf) { ub.DAT.hash = algo.Blake2bHash8( uint64(ub.DAT.md5h8rem), ub.Bytes(), ) - })) + }) } func (pb *DataBuilder) tea(typ uint8) *DataBuilder { diff --git a/gold/head/pool.go b/gold/head/pool.go index fca7e05..a60d022 100644 --- a/gold/head/pool.go +++ b/gold/head/pool.go @@ -8,5 +8,5 @@ var packetPool = pbuf.NewBufferPool[Packet]() // selectPacket 从池中取出一个 Packet func selectPacket(buf ...byte) *PacketItem { - return (*PacketItem)(packetPool.NewBuffer(buf)) + return packetPool.NewBuffer(buf) } diff --git a/gold/link/send.go b/gold/link/send.go index 2bf659e..c241bf8 100644 --- a/gold/link/send.go +++ b/gold/link/send.go @@ -65,14 +65,14 @@ func (l *Link) WritePacket(proto uint8, data []byte) { // 因为不保证可达所以不返回错误。 func (l *Link) write2peer(b pbuf.Bytes, seq uint32) { if l.doublepacket { - _, err := l.write2peer1(b, seq) + err := l.write2peer1(b, seq) if err != nil { if config.ShowDebugLog { logrus.Warnln("[send] double wr2peer", l.peerip, "err:", err) } } } - _, err := l.write2peer1(b, seq) + err := l.write2peer1(b, seq) if err != nil { if config.ShowDebugLog { logrus.Warnln("[send] wr2peer", l.peerip, "err:", err) @@ -81,15 +81,15 @@ func (l *Link) write2peer(b pbuf.Bytes, seq uint32) { } // write2peer1 计算 xor + b14 后向 peer 发一个包 -func (l *Link) write2peer1(b pbuf.Bytes, seq uint32) (n int, err error) { +func (l *Link) write2peer1(b pbuf.Bytes, seq uint32) (err error) { peerep := l.endpoint if bin.IsNilInterface(peerep) { - return 0, errors.New("nil endpoint of " + l.peerip.String()) + return errors.New("nil endpoint of " + l.peerip.String()) } conn := l.me.conn if conn == nil { - return 0, io.ErrClosedPipe + return io.ErrClosedPipe } b.V(func(data []byte) { if config.ShowDebugLog { @@ -134,7 +134,7 @@ func (l *Link) write2peer1(b pbuf.Bytes, seq uint32) (n int, err error) { if config.ShowDebugLog { logrus.Debugln("[send] write", len(b), "bytes data from ep", conn.LocalAddr(), "to", peerep) } - n, err = conn.WriteToPeer(b, peerep) + _, err = conn.WriteToPeer(b, peerep) }) return }