Skip to content

Commit 2121bc3

Browse files
committed
Fix error usages
1 parent bea2619 commit 2121bc3

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

stack_gvisor_lazy.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package tun
44

55
import (
66
"context"
7+
"errors"
78
"net"
89
"os"
910
"sync"
@@ -79,7 +80,7 @@ func (c *gLazyConn) HandshakeFailure(err error) error {
7980
if c.handshakeDone {
8081
return os.ErrInvalid
8182
}
82-
c.request.Complete(err != ErrDrop)
83+
c.request.Complete(!errors.Is(err, ErrDrop))
8384
c.handshakeDone = true
8485
c.handshakeErr = err
8586
return nil

stack_gvisor_tcp.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package tun
44

55
import (
66
"context"
7+
"errors"
78

89
"github.com/sagernet/gvisor/pkg/tcpip/stack"
910
"github.com/sagernet/gvisor/pkg/tcpip/transport/tcp"
@@ -37,7 +38,7 @@ func (f *TCPForwarder) Forward(r *tcp.ForwarderRequest) {
3738
destination := M.SocksaddrFrom(AddrFromAddress(r.ID().LocalAddress), r.ID().LocalPort)
3839
pErr := f.handler.PrepareConnection(N.NetworkTCP, source, destination)
3940
if pErr != nil {
40-
r.Complete(pErr != ErrDrop)
41+
r.Complete(!errors.Is(pErr, ErrDrop))
4142
return
4243
}
4344
conn := &gLazyConn{

stack_gvisor_udp.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package tun
44

55
import (
66
"context"
7+
"errors"
78
"math"
89
"net/netip"
910
"os"
@@ -59,7 +60,7 @@ func rangeIterate(r stack.Range, fn func(*buffer.View))
5960
func (f *UDPForwarder) PreparePacketConnection(source M.Socksaddr, destination M.Socksaddr, userData any) (bool, context.Context, N.PacketWriter, N.CloseHandlerFunc) {
6061
pErr := f.handler.PrepareConnection(N.NetworkUDP, source, destination)
6162
if pErr != nil {
62-
if pErr != ErrDrop {
63+
if !errors.Is(pErr, ErrDrop) {
6364
gWriteUnreachable(f.stack, userData.(*stack.PacketBuffer))
6465
}
6566
return false, nil, nil, nil

stack_system.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package tun
22

33
import (
44
"context"
5+
"errors"
56
"net"
67
"net/netip"
78
"syscall"
@@ -354,7 +355,7 @@ func (s *System) processIPv4TCP(ipHdr header.IPv4, tcpHdr header.TCP) (bool, err
354355
} else {
355356
natPort, err := s.tcpNat.Lookup(source, destination, s.handler)
356357
if err != nil {
357-
if err == ErrDrop {
358+
if errors.Is(err, ErrDrop) {
358359
return false, nil
359360
} else {
360361
return false, s.resetIPv4TCP(ipHdr, tcpHdr)
@@ -441,7 +442,7 @@ func (s *System) processIPv6TCP(ipHdr header.IPv6, tcpHdr header.TCP) (bool, err
441442
} else {
442443
natPort, err := s.tcpNat.Lookup(source, destination, s.handler)
443444
if err != nil {
444-
if err == ErrDrop {
445+
if errors.Is(err, ErrDrop) {
445446
return false, nil
446447
} else {
447448
return false, s.resetIPv6TCP(ipHdr, tcpHdr)
@@ -536,7 +537,7 @@ func (s *System) processIPv6UDP(ipHdr header.IPv6, udpHdr header.UDP) error {
536537
func (s *System) preparePacketConnection(source M.Socksaddr, destination M.Socksaddr, userData any) (bool, context.Context, N.PacketWriter, N.CloseHandlerFunc) {
537538
pErr := s.handler.PrepareConnection(N.NetworkUDP, source, destination)
538539
if pErr != nil {
539-
if pErr != ErrDrop {
540+
if !errors.Is(pErr, ErrDrop) {
540541
if source.IsIPv4() {
541542
ipHdr := userData.(header.IPv4)
542543
s.rejectIPv4WithICMP(ipHdr, header.ICMPv4PortUnreachable)

0 commit comments

Comments
 (0)