diff --git a/go.mod b/go.mod index 7e9418c66..e8e115e29 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/xtaci/kcp-go/v5 v5.6.14 github.com/xtaci/qpp v1.1.17 github.com/xtaci/smux v1.5.26 - github.com/xtaci/tcpraw v1.2.28 + github.com/xtaci/tcpraw v1.2.29 golang.org/x/crypto v0.26.0 ) diff --git a/go.sum b/go.sum index a8455d600..ce67f8977 100644 --- a/go.sum +++ b/go.sum @@ -86,6 +86,8 @@ github.com/xtaci/tcpraw v1.2.27 h1:p4E8XQBVrghFXkU5HU6zUOi/+howyzdM2r8gGiEMemo= github.com/xtaci/tcpraw v1.2.27/go.mod h1:yX76qCwZGnyIiEL3AO8rD/HONHCPGdwHJLQCCyhHbSs= github.com/xtaci/tcpraw v1.2.28 h1:fRZp0wE027xw/dRjq4wb/vDUxTPeBfenRv5Lmz/3zHg= github.com/xtaci/tcpraw v1.2.28/go.mod h1:T1blYD2EDkLneb+HtxddnzX38SoC9BG537EhkXeaT2k= +github.com/xtaci/tcpraw v1.2.29 h1:iVk1b2XiXNvIrMgtB3CkHCB/CigYXnG0tvFmOLUwCI8= +github.com/xtaci/tcpraw v1.2.29/go.mod h1:T1blYD2EDkLneb+HtxddnzX38SoC9BG537EhkXeaT2k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/vendor/github.com/xtaci/tcpraw/signal.go b/vendor/github.com/xtaci/tcpraw/signal.go index 7977bc01f..a6bb2e5e7 100644 --- a/vendor/github.com/xtaci/tcpraw/signal.go +++ b/vendor/github.com/xtaci/tcpraw/signal.go @@ -25,7 +25,6 @@ package tcpraw import ( - "container/list" "os" "os/signal" "sync" @@ -46,13 +45,11 @@ func sigHandler() { connListMu.Lock() var wg sync.WaitGroup wg.Add(connList.Len()) - var next *list.Element - for elem := connList.Front(); elem != nil; elem = next { - next = elem.Next() - go func() { - elem.Value.(*tcpConn).Close() + for elem := connList.Front(); elem != nil; elem = elem.Next() { + go func(conn *tcpConn) { + conn.Close() wg.Done() - }() + }(elem.Value.(*tcpConn)) } connListMu.Unlock() wg.Wait() diff --git a/vendor/modules.txt b/vendor/modules.txt index 274488c83..9bbc18efc 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -53,7 +53,7 @@ github.com/xtaci/qpp # github.com/xtaci/smux v1.5.26 ## explicit; go 1.13 github.com/xtaci/smux -# github.com/xtaci/tcpraw v1.2.28 +# github.com/xtaci/tcpraw v1.2.29 ## explicit; go 1.13 github.com/xtaci/tcpraw # golang.org/x/crypto v0.26.0