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.

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 a packetConn constructor so it can be re-used in outline-ss-server #300

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions transport/shadowsocks/packet_listener.go
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,10 @@ type packetConn struct {

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

func NewPacketConn(conn net.Conn, key *EncryptionKey) net.PacketConn {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a comment.

Is the inner conn closed on the outer conn close? May be worth commenting.

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