From bd03e59a7769b38afbe70adb2efea1c1a8c9dcd1 Mon Sep 17 00:00:00 2001 From: Toby Date: Thu, 5 Oct 2023 14:53:31 -0700 Subject: [PATCH] fix: quic-go sconn remoteAddr race condition --- app/go.mod | 2 +- app/go.sum | 4 ++-- core/go.mod | 2 +- core/go.sum | 4 ++-- extras/go.mod | 2 +- extras/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/go.mod b/app/go.mod index ba35fdd..feca934 100644 --- a/app/go.mod +++ b/app/go.mod @@ -18,7 +18,7 @@ require ( ) require ( - github.com/apernet/quic-go v0.39.1-0.20230930045547-13cecb45baa8 // indirect + github.com/apernet/quic-go v0.39.1-0.20231005215143-343a640d2145 // indirect github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect diff --git a/app/go.sum b/app/go.sum index d9ec22d..4ab7b1a 100644 --- a/app/go.sum +++ b/app/go.sum @@ -40,8 +40,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/apernet/go-tproxy v0.0.0-20230809025308-8f4723fd742f h1:uVh0qpEslrWjgzx9vOcyCqsOY3c9kofDZ1n+qaw35ZY= github.com/apernet/go-tproxy v0.0.0-20230809025308-8f4723fd742f/go.mod h1:xkkq9D4ygcldQQhKS/w9CadiCKwCngU7K9E3DaKahpM= -github.com/apernet/quic-go v0.39.1-0.20230930045547-13cecb45baa8 h1:jZKdY1/SFnt6iRzSBMzaeXmgWKwSsAW2slf/o0+b3bs= -github.com/apernet/quic-go v0.39.1-0.20230930045547-13cecb45baa8/go.mod h1:UwsoszQlzTm+dBDuFEwWBYt46K56WqlFEN0RWLvQ0rE= +github.com/apernet/quic-go v0.39.1-0.20231005215143-343a640d2145 h1:usy18BdrtpdobIfGZKkOj6KOlcmqXzhlmHCpoPU+uyc= +github.com/apernet/quic-go v0.39.1-0.20231005215143-343a640d2145/go.mod h1:UwsoszQlzTm+dBDuFEwWBYt46K56WqlFEN0RWLvQ0rE= github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6 h1:4NNbNM2Iq/k57qEu7WfL67UrbPq1uFWxW4qODCohi+0= github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6/go.mod h1:J29hk+f9lJrblVIfiJOtTFk+OblBawmib4uz/VdKzlg= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= diff --git a/core/go.mod b/core/go.mod index 370ef37..cf3abcc 100644 --- a/core/go.mod +++ b/core/go.mod @@ -3,7 +3,7 @@ module github.com/apernet/hysteria/core go 1.21 require ( - github.com/apernet/quic-go v0.39.1-0.20230930045547-13cecb45baa8 + github.com/apernet/quic-go v0.39.1-0.20231005215143-343a640d2145 github.com/stretchr/testify v1.8.4 go.uber.org/goleak v1.2.1 golang.org/x/exp v0.0.0-20221205204356-47842c84f3db diff --git a/core/go.sum b/core/go.sum index a8dfbb7..2e843c8 100644 --- a/core/go.sum +++ b/core/go.sum @@ -1,5 +1,5 @@ -github.com/apernet/quic-go v0.39.1-0.20230930045547-13cecb45baa8 h1:jZKdY1/SFnt6iRzSBMzaeXmgWKwSsAW2slf/o0+b3bs= -github.com/apernet/quic-go v0.39.1-0.20230930045547-13cecb45baa8/go.mod h1:UwsoszQlzTm+dBDuFEwWBYt46K56WqlFEN0RWLvQ0rE= +github.com/apernet/quic-go v0.39.1-0.20231005215143-343a640d2145 h1:usy18BdrtpdobIfGZKkOj6KOlcmqXzhlmHCpoPU+uyc= +github.com/apernet/quic-go v0.39.1-0.20231005215143-343a640d2145/go.mod h1:UwsoszQlzTm+dBDuFEwWBYt46K56WqlFEN0RWLvQ0rE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= diff --git a/extras/go.mod b/extras/go.mod index 993306f..d581f39 100644 --- a/extras/go.mod +++ b/extras/go.mod @@ -14,7 +14,7 @@ require ( ) require ( - github.com/apernet/quic-go v0.39.1-0.20230930045547-13cecb45baa8 // indirect + github.com/apernet/quic-go v0.39.1-0.20231005215143-343a640d2145 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect diff --git a/extras/go.sum b/extras/go.sum index ffccd93..ee8661d 100644 --- a/extras/go.sum +++ b/extras/go.sum @@ -1,5 +1,5 @@ -github.com/apernet/quic-go v0.39.1-0.20230930045547-13cecb45baa8 h1:jZKdY1/SFnt6iRzSBMzaeXmgWKwSsAW2slf/o0+b3bs= -github.com/apernet/quic-go v0.39.1-0.20230930045547-13cecb45baa8/go.mod h1:UwsoszQlzTm+dBDuFEwWBYt46K56WqlFEN0RWLvQ0rE= +github.com/apernet/quic-go v0.39.1-0.20231005215143-343a640d2145 h1:usy18BdrtpdobIfGZKkOj6KOlcmqXzhlmHCpoPU+uyc= +github.com/apernet/quic-go v0.39.1-0.20231005215143-343a640d2145/go.mod h1:UwsoszQlzTm+dBDuFEwWBYt46K56WqlFEN0RWLvQ0rE= github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6 h1:4NNbNM2Iq/k57qEu7WfL67UrbPq1uFWxW4qODCohi+0= github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6/go.mod h1:J29hk+f9lJrblVIfiJOtTFk+OblBawmib4uz/VdKzlg= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=