Skip to content

Commit

Permalink
Remove no longer necessary l4StreamConn.
Browse files Browse the repository at this point in the history
  • Loading branch information
sbruens committed Nov 22, 2024
1 parent af898e8 commit a5a2456
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions caddy/shadowsocks_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func (h *ShadowsocksHandler) Provision(ctx caddy.Context) error {
func (h *ShadowsocksHandler) Handle(cx *layer4.Connection, _ layer4.Handler) error {
switch conn := cx.Conn.(type) {
case transport.StreamConn:
h.service.HandleStream(cx.Context, &l4StreamConn{Connection: cx, wrappedStreamConn: conn})
h.service.HandleStream(cx.Context, conn)
case net.Conn:
n, err := cx.Read(h.buffer)
if err != nil {
Expand All @@ -133,18 +133,3 @@ func (h *ShadowsocksHandler) Handle(cx *layer4.Connection, _ layer4.Handler) err
}
return nil
}

type l4StreamConn struct {
*layer4.Connection
wrappedStreamConn transport.StreamConn
}

var _ transport.StreamConn = (*l4StreamConn)(nil)

func (c l4StreamConn) CloseRead() error {
return c.wrappedStreamConn.CloseRead()
}

func (c l4StreamConn) CloseWrite() error {
return c.wrappedStreamConn.CloseWrite()
}

0 comments on commit a5a2456

Please sign in to comment.