Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0c556bc

Browse files
wwqgtxxwwqgtxx
committed
chore: replace hashicorp/yamux to our forked libp2p/go-yamux
1 parent 7e71d21 commit 0c556bc

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/metacubex/randv2 v0.2.0
2626
github.com/metacubex/restls-client-go v0.1.7
2727
github.com/metacubex/sing v0.5.6-0.20250912172506-82b42a287539
28-
github.com/metacubex/sing-mux v0.3.3
28+
github.com/metacubex/sing-mux v0.3.4-0.20250918084132-3bcf39257411
2929
github.com/metacubex/sing-quic v0.0.0-20250909002258-06122df8f231
3030
github.com/metacubex/sing-shadowsocks v0.2.12
3131
github.com/metacubex/sing-shadowsocks2 v0.2.7
@@ -82,7 +82,6 @@ require (
8282
github.com/google/btree v1.1.3 // indirect
8383
github.com/google/go-cmp v0.6.0 // indirect
8484
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
85-
github.com/hashicorp/yamux v0.1.2 // indirect
8685
github.com/josharian/native v1.1.0 // indirect
8786
github.com/kr/text v0.2.0 // indirect
8887
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
@@ -91,6 +90,7 @@ require (
9190
github.com/metacubex/ascon v0.1.0 // indirect
9291
github.com/metacubex/gvisor v0.0.0-20250910065513-46d8fd52f27b // indirect
9392
github.com/metacubex/nftables v0.0.0-20250503052935-30a69ab87793 // indirect
93+
github.com/metacubex/yamux v0.0.0-20250918083631-dd5f17c0be49 // indirect
9494
github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect
9595
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
9696
github.com/pierrec/lz4/v4 v4.1.14 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
6868
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
6969
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
7070
github.com/google/tink/go v1.6.1 h1:t7JHqO8Ath2w2ig5vjwQYJzhGEZymedQc90lQXUBa4I=
71-
github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8=
72-
github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns=
7371
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
7472
github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905 h1:q3OEI9RaN/wwcx+qgGo6ZaoJkCiDYe/gjDLfq7lQQF4=
7573
github.com/insomniacslk/dhcp v0.0.0-20250109001534-8abf58130905/go.mod h1:VvGYjkZoJyKqlmT1yzakUs4mfKMNB0XdODP0+rdml6k=
@@ -119,8 +117,8 @@ github.com/metacubex/restls-client-go v0.1.7/go.mod h1:BN/U52vPw7j8VTSh2vleD/Mnm
119117
github.com/metacubex/sing v0.5.2/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
120118
github.com/metacubex/sing v0.5.6-0.20250912172506-82b42a287539 h1:ArXEdw7JvbL3dLc3D7kBGTDmuBBI/sNIyR3O4MlfPH8=
121119
github.com/metacubex/sing v0.5.6-0.20250912172506-82b42a287539/go.mod h1:ypf0mjwlZm0sKdQSY+yQvmsbWa0hNPtkeqyRMGgoN+w=
122-
github.com/metacubex/sing-mux v0.3.3 h1:oqCbUAJgTLsa71vfo8otW8xIhrDfbc/Y2rmtW34sQjg=
123-
github.com/metacubex/sing-mux v0.3.3/go.mod h1:3rt1soewn0O6j89GCLmwAQFsq257u0jf2zQSPhTL3Bw=
120+
github.com/metacubex/sing-mux v0.3.4-0.20250918084132-3bcf39257411 h1:CP7GHdopEHAl95jG6fogImChzhLlV2Hzw4PYKaPoX1c=
121+
github.com/metacubex/sing-mux v0.3.4-0.20250918084132-3bcf39257411/go.mod h1:SEJfAuykNj/ozbPqngEYqyggwSr81+L7Nu09NRD5mh4=
124122
github.com/metacubex/sing-quic v0.0.0-20250909002258-06122df8f231 h1:dGvo7UahC/gYBQNBoictr14baJzBjAKUAorP63QFFtg=
125123
github.com/metacubex/sing-quic v0.0.0-20250909002258-06122df8f231/go.mod h1:B60FxaPHjR1SeQB0IiLrgwgvKsaoASfOWdiqhLjmMGA=
126124
github.com/metacubex/sing-shadowsocks v0.2.12 h1:Wqzo8bYXrK5aWqxu/TjlTnYZzAKtKsaFQBdr6IHFaBE=
@@ -143,6 +141,8 @@ github.com/metacubex/utls v1.8.1-0.20250916021850-3fcad0728a32 h1:endaN8dWxRofYp
143141
github.com/metacubex/utls v1.8.1-0.20250916021850-3fcad0728a32/go.mod h1:67I3skhEY4Sya8f1YxELwWPoeQdXqZCrWNYLvq8gn2U=
144142
github.com/metacubex/wireguard-go v0.0.0-20250820062549-a6cecdd7f57f h1:FGBPRb1zUabhPhDrlKEjQ9lgIwQ6cHL4x8M9lrERhbk=
145143
github.com/metacubex/wireguard-go v0.0.0-20250820062549-a6cecdd7f57f/go.mod h1:oPGcV994OGJedmmxrcK9+ni7jUEMGhR+uVQAdaduIP4=
144+
github.com/metacubex/yamux v0.0.0-20250918083631-dd5f17c0be49 h1:lhlqpYHopuTLx9xQt22kSA9HtnyTDmk5XjjQVCGHe2E=
145+
github.com/metacubex/yamux v0.0.0-20250918083631-dd5f17c0be49/go.mod h1:MBeEa9IVBphH7vc3LNtW6ZujVXFizotPo3OEiHQ+TNU=
146146
github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
147147
github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs=
148148
github.com/mroth/weightedrand/v2 v2.1.0 h1:o1ascnB1CIVzsqlfArQQjeMy1U0NcIbBO5rfd5E/OeU=

‎listener/inbound/mux_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/stretchr/testify/assert"
99
)
1010

11-
var singMuxProtocolList = []string{"smux"} // don't test "h2mux" and "yamux" because it has some confused bugs
11+
var singMuxProtocolList = []string{"smux", "yamux"} // don't test "h2mux" because it has some confused bugs
1212

1313
// notCloseProxyAdapter is a proxy adapter that does not close the underlying outbound.ProxyAdapter.
1414
// The outbound.SingMux will close the underlying outbound.ProxyAdapter when it is closed, but we don't want to close it.

0 commit comments

Comments
 (0)