Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add packetConn constructor for re-use in outline-ss-server #300

Merged
merged 2 commits into from
Nov 14, 2024
Merged

add packetConn constructor for re-use in outline-ss-server #300

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81a8db4
Add a constructor for `packetConn` so it can be re-used in `outline-s…
sbruens Oct 18, 2024
ec75f60
Add a comment to `NewPacketConn`.
sbruens Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions transport/shadowsocks/packet_listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ func (c *packetListener) ListenPacket(ctx context.Context) (net.PacketConn, erro
if err != nil {
return nil, fmt.Errorf("could not connect to endpoint: %w", err)
}
conn := packetConn{Conn: proxyConn, key: c.key}
return &conn, nil
return NewPacketConn(proxyConn, c.key), nil
}

type packetConn struct {
Expand All @@ -65,6 +64,15 @@ type packetConn struct {

var _ net.PacketConn = (*packetConn)(nil)

// NewPacketConn wraps a [net.Conn] and returns a [net.PacketConn] that encrypts/decrypts
// packets before writing/reading them to/from the underlying connection using the provided
// encryption key.
//
// Closing the returned [net.PacketConn] will also close the underlying [net.Conn].
func NewPacketConn(conn net.Conn, key *EncryptionKey) net.PacketConn {
sbruens marked this conversation as resolved.
Show resolved Hide resolved
return &packetConn{Conn: conn, key: key}
}

// WriteTo encrypts `b` and writes to `addr` through the proxy.
func (c *packetConn) WriteTo(b []byte, addr net.Addr) (int, error) {
socksTargetAddr := socks.ParseAddr(addr.String())
Expand Down
Loading