Skip to content

Commit

Permalink
fix lint warnings in packetaddr
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiaokangwang
xiaokangwang committed Jan 3, 2022
1 parent dc5cffc commit 0f2da63
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 27 deletions.
2 changes: 1 addition & 1 deletion app/proxyman/outbound/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func (h *Handler) Dial(ctx context.Context, dest net.Destination) (internet.Conn
outbound.Gateway = h.senderSettings.Via.AsAddress()
}
}
var enablePacketAddrCapture = true
enablePacketAddrCapture := true
if h.senderSettings != nil && h.senderSettings.ProxySettings != nil && h.senderSettings.ProxySettings.HasTag() && h.senderSettings.ProxySettings.TransportLayerProxy {
tag := h.senderSettings.ProxySettings.Tag
newError("transport layer proxying to ", tag, " for dest ", dest).AtDebug().WriteToLog(session.ExportIDToError(ctx))
Expand Down
21 changes: 13 additions & 8 deletions common/net/packetaddr/connection_adaptor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ import (
"sync"
"time"

"github.com/v2fly/v2ray-core/v4/common"
"github.com/v2fly/v2ray-core/v4/common/buf"
"github.com/v2fly/v2ray-core/v4/common/errors"
"github.com/v2fly/v2ray-core/v4/common/net"
"github.com/v2fly/v2ray-core/v4/features/routing"
"github.com/v2fly/v2ray-core/v4/transport"
"github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v5/common/buf"
"github.com/v2fly/v2ray-core/v5/common/errors"
"github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v5/features/routing"
"github.com/v2fly/v2ray-core/v5/transport"
)

var errNotPacketConn = errors.New("not a packet connection")
var errUnsupported = errors.New("unsupported action")
var (
errNotPacketConn = errors.New("not a packet connection")
errUnsupported = errors.New("unsupported action")
)

func ToPacketAddrConn(link *transport.Link, dest net.Destination) (net.PacketConn, error) {
if !dest.Address.Family().IsDomain() {
Expand Down Expand Up @@ -80,6 +82,9 @@ func (c *packetConnectionAdaptor) WriteTo(p []byte, addr gonet.Addr) (n int, err
payloadLen := len(p)
var buffer *buf.Buffer
buffer, err = AttachAddressToPacket(buf.FromBytes(p), addr)
if err != nil {
return 0, err
}
mb := buf.MultiBuffer{buffer}
err = c.link.Writer.WriteMultiBuffer(mb)
if err != nil {
Expand Down
9 changes: 5 additions & 4 deletions common/net/packetaddr/packetaddr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package packetaddr

import (
"bytes"
"github.com/v2fly/v2ray-core/v4/common/buf"
"github.com/v2fly/v2ray-core/v4/common/net"
"github.com/v2fly/v2ray-core/v4/common/protocol"
gonet "net"

"github.com/v2fly/v2ray-core/v5/common/buf"
"github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v5/common/protocol"
)

var addrParser = protocol.NewAddressParser(
Expand Down Expand Up @@ -44,7 +45,7 @@ func ExtractAddressFromPacket(data *buf.Buffer) (*buf.Buffer, gonet.Addr, error)
if err != nil {
return nil, nil, err
}
var addr = &gonet.UDPAddr{
addr := &gonet.UDPAddr{
IP: address.IP(),
Port: int(port.Value()),
Zone: "",
Expand Down
6 changes: 4 additions & 2 deletions common/net/packetaddr/packetaddr_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package packetaddr

import (
"github.com/stretchr/testify/assert"
"github.com/v2fly/v2ray-core/v4/common/buf"
sysnet "net"
"testing"

"github.com/stretchr/testify/assert"

"github.com/v2fly/v2ray-core/v4/common/buf"
)

func TestPacketEncodingIPv4(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion proxy/socks/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ package socks

import (
"context"
"time"

"github.com/v2fly/v2ray-core/v4/common/net/packetaddr"
"github.com/v2fly/v2ray-core/v4/transport/internet/udp"
"time"

core "github.com/v2fly/v2ray-core/v5"
"github.com/v2fly/v2ray-core/v5/common"
Expand Down
4 changes: 2 additions & 2 deletions proxy/socks/protocol.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,9 +390,9 @@ func (r *UDPReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
return buf.MultiBuffer{b}, nil
}

func (v *UDPReader) ReadFrom(p []byte) (n int, addr gonet.Addr, err error) {
func (r *UDPReader) ReadFrom(p []byte) (n int, addr gonet.Addr, err error) {
buffer := buf.New()
_, err = buffer.ReadFrom(v.reader)
_, err = buffer.ReadFrom(r.reader)
if err != nil {
buffer.Release()
return 0, nil, err
Expand Down
2 changes: 1 addition & 1 deletion proxy/socks/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package socks

import (
"context"
"github.com/v2fly/v2ray-core/v4/common/net/packetaddr"
"io"
"time"

Expand All @@ -11,6 +10,7 @@ import (
"github.com/v2fly/v2ray-core/v5/common/buf"
"github.com/v2fly/v2ray-core/v5/common/log"
"github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v5/common/net/packetaddr"
"github.com/v2fly/v2ray-core/v5/common/protocol"
udp_proto "github.com/v2fly/v2ray-core/v5/common/protocol/udp"
"github.com/v2fly/v2ray-core/v5/common/session"
Expand Down
6 changes: 3 additions & 3 deletions transport/internet/udp/copy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package udp
import (
gonet "net"

"github.com/v2fly/v2ray-core/v4/common/signal"
"github.com/v2fly/v2ray-core/v4/transport/internet"
"github.com/v2fly/v2ray-core/v5/common/signal"
"github.com/v2fly/v2ray-core/v5/transport/internet"
)

type dataHandler func(content []byte, address gonet.Addr)
Expand All @@ -31,7 +31,7 @@ func CopyPacketConn(dst internet.AbstractPacketConnWriter, src internet.Abstract
handler(buffer[:n], addr)
}

n, err = dst.WriteTo(buffer[:n], addr)
_, err = dst.WriteTo(buffer[:n], addr)
if err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions transport/internet/udp/dispatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package udp

import (
"context"

"github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v5/common/buf"
"github.com/v2fly/v2ray-core/v5/common/net"
Expand Down
12 changes: 7 additions & 5 deletions transport/internet/udp/dispatcher_packetaddr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ package udp

import (
"context"
"github.com/v2fly/v2ray-core/v4/common/buf"
"github.com/v2fly/v2ray-core/v4/common/net"
"github.com/v2fly/v2ray-core/v4/common/net/packetaddr"
"github.com/v2fly/v2ray-core/v4/common/protocol/udp"
"github.com/v2fly/v2ray-core/v4/features/routing"

"github.com/v2fly/v2ray-core/v5/common/buf"
"github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v5/common/net/packetaddr"
"github.com/v2fly/v2ray-core/v5/common/protocol/udp"
"github.com/v2fly/v2ray-core/v5/features/routing"
)

type PacketAddrDispatcher struct {
Expand All @@ -25,6 +26,7 @@ func (p PacketAddrDispatcher) Dispatch(ctx context.Context, destination net.Dest
}
p.conn.WriteTo(payload.Bytes(), &net.UDPAddr{IP: destination.Address.IP(), Port: int(destination.Port.Value())})
}

func (p PacketAddrDispatcher) readWorker() {
for {
readBuf := buf.New()
Expand Down

0 comments on commit 0f2da63

Please sign in to comment.