From ec33e782af7d4a75e46e59c2e794b74aa3f0d78e Mon Sep 17 00:00:00 2001 From: dviejokfs Date: Mon, 15 Aug 2022 11:29:07 +0200 Subject: [PATCH] Update dependency yamux --- cmd/server/server.go | 3 +++ go.mod | 2 +- go.sum | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/server/server.go b/cmd/server/server.go index e64a457..73b4e41 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -201,6 +201,9 @@ func (c *serverCmd) handleTunnelRequest(mux *vhost.TLSMuxer, conn net.Conn) erro if err := d.CloseWrite(); err != nil { log.Trace().Msgf("%s: closeWrite error: %s", side, err) } + if err := d.CloseRead(); err != nil { + log.Trace().Msgf("%s: closeRead error: %s", side, err) + } } log.Trace().Msgf("done proxing %s -> %s: %d bytes in %s", src.RemoteAddr(), dst.RemoteAddr(), n, time.Since(tStart)) } diff --git a/go.mod b/go.mod index 9c775c4..3a0b2d7 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/gin-gonic/gin v1.7.7 github.com/golang/protobuf v1.5.0 - github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864 + github.com/hashicorp/yamux v0.1.2-0.20220728231903-574fd304fd65 github.com/kfsoftware/go-vhost v0.0.1 github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.26.1 diff --git a/go.sum b/go.sum index 24a5850..50e1f30 100644 --- a/go.sum +++ b/go.sum @@ -111,6 +111,8 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864 h1:Y4V+SFe7d3iH+9pJCoeWIOS5/xBJIFsltS7E+KJSsJY= github.com/hashicorp/yamux v0.0.0-20210316155119-a95892c5f864/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= +github.com/hashicorp/yamux v0.1.2-0.20220728231903-574fd304fd65 h1:gCTPZcFU6p3rheaT966vpU9LPtfSxXgElYru5ToLryE= +github.com/hashicorp/yamux v0.1.2-0.20220728231903-574fd304fd65/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=