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

chore: make lint happy

Browse Source
This commit is contained in:
源文雨
2025-03-12 22:24:16 +09:00
parent f4fd9b1423
commit c2dd7b5d05
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.golangci.yml
View File

@@ -4,8 +4,8 @@ linters-settings:
ignoretests: true ignoretests: true
exclude-functions: exclude-functions:
- (*os.File).Write - (*os.File).Write
- (*github.com/fumiama/WireGold/bin.Writer).Write - (*github.com/fumiama/WireGold/internal/bin.Writer).Write
- (*github.com/fumiama/WireGold/bin.Writer).WriteByte - (*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).Write
- (*github.com/fumiama/WireGold/upper/services/tunnel.Tunnel).Read - (*github.com/fumiama/WireGold/upper/services/tunnel.Tunnel).Read

2
config/global.go
View File

@@ -1,3 +1,3 @@
package config package config
const ShowDebugLog = true const ShowDebugLog = false

4
gold/head/builder.go
View File

@@ -95,11 +95,11 @@ func (pb *DataBuilder) Zstd() *DataBuilder {
} }
func (pb *DataBuilder) Hash() *DataBuilder { func (pb *DataBuilder) Hash() *DataBuilder {
return (*DataBuilder)(pb.p(func(ub *PacketBuf) { return pb.p(func(ub *PacketBuf) {
ub.DAT.hash = algo.Blake2bHash8( ub.DAT.hash = algo.Blake2bHash8(
uint64(ub.DAT.md5h8rem), ub.Bytes(), uint64(ub.DAT.md5h8rem), ub.Bytes(),
) )
})) })
} }
func (pb *DataBuilder) tea(typ uint8) *DataBuilder { func (pb *DataBuilder) tea(typ uint8) *DataBuilder {

2
gold/head/pool.go
View File

@@ -8,5 +8,5 @@ var packetPool = pbuf.NewBufferPool[Packet]()
// selectPacket 从池中取出一个 Packet // selectPacket 从池中取出一个 Packet
func selectPacket(buf ...byte) *PacketItem { func selectPacket(buf ...byte) *PacketItem {
return (*PacketItem)(packetPool.NewBuffer(buf)) return packetPool.NewBuffer(buf)
} }

12
gold/link/send.go
View File

@@ -65,14 +65,14 @@ func (l *Link) WritePacket(proto uint8, data []byte) {
// 因为不保证可达所以不返回错误。 // 因为不保证可达所以不返回错误。
func (l *Link) write2peer(b pbuf.Bytes, seq uint32) { func (l *Link) write2peer(b pbuf.Bytes, seq uint32) {
if l.doublepacket { if l.doublepacket {
_, err := l.write2peer1(b, seq) err := l.write2peer1(b, seq)
if err != nil { if err != nil {
if config.ShowDebugLog { if config.ShowDebugLog {
logrus.Warnln("[send] double wr2peer", l.peerip, "err:", err) logrus.Warnln("[send] double wr2peer", l.peerip, "err:", err)
} }
} }
} }
_, err := l.write2peer1(b, seq) err := l.write2peer1(b, seq)
if err != nil { if err != nil {
if config.ShowDebugLog { if config.ShowDebugLog {
logrus.Warnln("[send] wr2peer", l.peerip, "err:", err) 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 发一个包 // 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 peerep := l.endpoint
if bin.IsNilInterface(peerep) { 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 conn := l.me.conn
if conn == nil { if conn == nil {
return 0, io.ErrClosedPipe return io.ErrClosedPipe
} }
b.V(func(data []byte) { b.V(func(data []byte) {
if config.ShowDebugLog { if config.ShowDebugLog {
@@ -134,7 +134,7 @@ func (l *Link) write2peer1(b pbuf.Bytes, seq uint32) (n int, err error) {
if config.ShowDebugLog { if config.ShowDebugLog {
logrus.Debugln("[send] write", len(b), "bytes data from ep", conn.LocalAddr(), "to", peerep) 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 return
} }