Skip to content

Commit 7de271d

Browse files
committed
Pass linter
1 parent 96110d2 commit 7de271d

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func parsePort(section *ini.Section, keyName string) (int, error) {
110110
return 0, err
111111
}
112112

113-
if !(port >= 0 && port < 65536) {
113+
if port < 0 || port >= 65536 {
114114
return 0, errors.New("port should be >= 0 and < 65536")
115115
}
116116

http.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,15 @@ func (s *HTTPServer) serve(conn net.Conn) {
133133
}
134134

135135
go func() {
136-
defer conn.Close()
137-
defer peer.Close()
136+
defer func() { _ = conn.Close() }()
137+
defer func() { _ = peer.Close() }()
138138

139139
_, _ = io.Copy(conn, peer)
140140
}()
141141

142142
go func() {
143-
defer conn.Close()
144-
defer peer.Close()
143+
defer func() { _ = conn.Close() }()
144+
defer func() { _ = peer.Close() }()
145145

146146
_, _ = io.Copy(peer, conn)
147147
}()

routine.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ func (c CredentialValidator) Valid(username, password string) bool {
210210

211211
// connForward copy data from `from` to `to`
212212
func connForward(from io.ReadWriteCloser, to io.ReadWriteCloser) {
213-
defer from.Close()
214-
defer to.Close()
213+
defer func() { _ = from.Close() }()
214+
defer func() { _ = to.Close() }()
215215

216216
_, err := io.Copy(to, from)
217217
if err != nil {
@@ -464,7 +464,7 @@ func (d VirtualTun) pingIPs() {
464464
d.PingRecord[addr.String()] = uint64(time.Now().Unix())
465465
d.PingRecordLock.Unlock()
466466

467-
defer socket.Close()
467+
defer func() { _ = socket.Close() }()
468468
}()
469469
}
470470
}

wireguard.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,27 @@ type DeviceSetting struct {
2525
func CreateIPCRequest(conf *DeviceConfig) (*DeviceSetting, error) {
2626
var request bytes.Buffer
2727

28-
request.WriteString(fmt.Sprintf("private_key=%s\n", conf.SecretKey))
28+
fmt.Fprintf(&request, "private_key=%s\n", conf.SecretKey)
2929

3030
if conf.ListenPort != nil {
31-
request.WriteString(fmt.Sprintf("listen_port=%d\n", *conf.ListenPort))
31+
fmt.Fprintf(&request, "listen_port=%d\n", *conf.ListenPort)
3232
}
3333

3434
for _, peer := range conf.Peers {
35-
request.WriteString(fmt.Sprintf(heredoc.Doc(`
35+
fmt.Fprintf(&request, heredoc.Doc(`
3636
public_key=%s
3737
persistent_keepalive_interval=%d
3838
preshared_key=%s
3939
`),
4040
peer.PublicKey, peer.KeepAlive, peer.PreSharedKey,
41-
))
41+
)
4242
if peer.Endpoint != nil {
43-
request.WriteString(fmt.Sprintf("endpoint=%s\n", *peer.Endpoint))
43+
fmt.Fprintf(&request, "endpoint=%s\n", *peer.Endpoint)
4444
}
4545

4646
if len(peer.AllowedIPs) > 0 {
4747
for _, ip := range peer.AllowedIPs {
48-
request.WriteString(fmt.Sprintf("allowed_ip=%s\n", ip.String()))
48+
fmt.Fprintf(&request, "allowed_ip=%s\n", ip.String())
4949
}
5050
} else {
5151
request.WriteString(heredoc.Doc(`

0 commit comments

Comments
 (0)