1
0
mirror of https://github.com/fumiama/WireGold.git synced 2026-06-05 16:00:28 +08:00

chore: make lint happy

This commit is contained in:
源文雨
2024-07-11 18:14:24 +09:00
parent c0f31a70c8
commit 0edf4e92c3
5 changed files with 90 additions and 10 deletions

73
.golangci.yml Normal file
View File

@@ -0,0 +1,73 @@
linters-settings:
errcheck:
ignore: fmt:.*,io/ioutil:^Read.*
ignoretests: true
exclude-functions:
- github.com/fumiama/WireGold/helper.(*Writer).Write.*
- github.com/fumiama/WireGold/upper/services/tunnel.(*Tunnel).(Write|Read)
goimports:
local-prefixes: github.com/fumiama/WireGold
linters:
# please, do not use `enable-all`: it's deprecated and will be removed soon.
# inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
disable-all: true
fast: false
enable:
- bodyclose
#- deadcode
#- depguard
- dogsled
- dupl
- errcheck
- exportloopref
- exhaustive
#- funlen
#- goconst
#- gocritic
#- gocyclo
- gofumpt
- goimports
- goprintffuncname
#- gosec
- gosimple
- govet
- ineffassign
- misspell
- nolintlint
- rowserrcheck
- staticcheck
#- structcheck
#- stylecheck
- typecheck
- unconvert
- unparam
- unused
#- varcheck
- whitespace
- prealloc
- predeclared
- asciicheck
#- revive
- makezero
#- interfacer
run:
# default concurrency is a available CPU number.
# concurrency: 4 # explicitly omit this value to fully utilize available resources.
deadline: 5m
issues-exit-code: 1
tests: false
# output configuration options
output:
format: 'colored-line-number'
print-issued-lines: true
print-linter-name: true
uniq-by-line: true
issues:
# Fix found issues (if it's supported by the linter)
fix: true

View File

@@ -157,8 +157,12 @@ func (m *Me) listenthread(packet *head.Packet, addr *net.UDPAddr, index int, fin
p.pipe <- packet
logrus.Debugln("[listen] @", index, "deliver to pipe of", p.peerip)
} else {
m.nic.Write(packet.Data)
logrus.Debugln("[listen] @", index, "deliver", len(packet.Data), "bytes data to nic")
_, err := m.nic.Write(packet.Data)
if err != nil {
logrus.Errorln("[listen] @", index, "deliver", len(packet.Data), "bytes data to nic err:", err)
} else {
logrus.Debugln("[listen] @", index, "deliver", len(packet.Data), "bytes data to nic")
}
packet.Put()
}
default:

View File

@@ -121,7 +121,7 @@ func (m *Me) MTU() uint16 {
return m.mtu
}
func (m *Me) Close() error {
func (m *Me) CloseNIC() error {
m.nic.Down()
return m.nic.Close()
}
@@ -132,7 +132,7 @@ func (m *Me) Write(packet []byte) (n int, err error) {
return
}
func (m *Me) ListenFromNIC() (written int64, err error) {
func (m *Me) ListenNIC() (written int64, err error) {
m.nic.Up()
return io.Copy(m, m.nic)
}

View File

@@ -86,8 +86,12 @@ func (l *Link) onQuery(packet []byte) {
if len(notify) > 0 {
logrus.Infoln("[nat] query wrap", len(notify), "notify")
w := helper.SelectWriter()
json.NewEncoder(w).Encode(&notify)
l.WriteAndPut(head.NewPacket(head.ProtoNotify, l.me.srcport, l.peerip, l.me.dstport, w.Bytes()), false)
_ = json.NewEncoder(w).Encode(&notify)
_, err = l.WriteAndPut(head.NewPacket(head.ProtoNotify, l.me.srcport, l.peerip, l.me.dstport, w.Bytes()), false)
if err != nil {
logrus.Errorln("[nat] notify peer", l, "err:", err)
return
}
helper.PutWriter(w)
}
}

View File

@@ -49,20 +49,19 @@ func NewWireGold(c *config.Config) (wg WG, err error) {
}
func (wg *WG) Start(srcport, destport uint16) {
wg.init(srcport, destport)
go wg.me.ListenFromNIC()
go wg.Run(srcport, destport)
}
func (wg *WG) Run(srcport, destport uint16) {
wg.init(srcport, destport)
_, err := wg.me.ListenFromNIC()
_, err := wg.me.ListenNIC()
if err != nil {
logrus.Panicln(err)
}
}
func (wg *WG) Stop() {
_ = wg.me.Close()
_ = wg.me.CloseNIC()
}
func (wg *WG) init(srcport, dstport uint16) {