Skip to content

Commit

Permalink
chore(sync): fix bad ipversion selection causes no network
Browse files Browse the repository at this point in the history
Co-authored-by: daebot <[email protected]>
  • Loading branch information
dae-prow[bot] and daebot authored Aug 5, 2023
1 parent 05f6ebf commit 94ccae4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dae-core
Submodule dae-core updated 43 files
+3 −3 cmd/run.go
+1 −1 common/bitlist/bitlist.go
+3 −3 common/netutils/dns.go
+1 −1 common/netutils/ip46.go
+1 −1 common/netutils/ip46_test.go
+1 −1 common/utils.go
+1 −1 component/dns/upstream.go
+1 −1 component/outbound/dialer/alive_dialer_set.go
+1 −1 component/outbound/dialer/block.go
+10 −3 component/outbound/dialer/connectivity_check.go
+1 −1 component/outbound/dialer/dialer.go
+2 −2 component/outbound/dialer/direct.go
+2 −2 component/outbound/dialer/http/http.go
+2 −2 component/outbound/dialer/juicity/juicity.go
+2 −2 component/outbound/dialer/register.go
+3 −3 component/outbound/dialer/shadowsocks/shadowsocks.go
+5 −5 component/outbound/dialer/shadowsocksr/shadowsocksr.go
+2 −2 component/outbound/dialer/socks/socks.go
+1 −1 component/outbound/dialer/socks/socks_test.go
+3 −3 component/outbound/dialer/trojan/trojan.go
+2 −2 component/outbound/dialer/tuic/tuic.go
+5 −5 component/outbound/dialer/v2ray/v2ray.go
+13 −3 component/outbound/dialer_group.go
+1 −1 component/outbound/dialer_group_test.go
+6 −6 component/outbound/outbound.go
+3 −3 component/outbound/transport/simpleobfs/http.go
+1 −1 component/outbound/transport/simpleobfs/simpleobfs.go
+2 −2 component/outbound/transport/simpleobfs/tls.go
+1 −1 component/outbound/transport/tls/tls.go
+1 −1 component/outbound/transport/ws/ws.go
+1 −1 component/sniffing/internal/quicutils/cipher.go
+1 −1 component/sniffing/internal/quicutils/hkdf.go
+1 −1 component/sniffing/internal/quicutils/relocation.go
+1 −1 component/sniffing/quic.go
+1 −1 component/sniffing/sniffing_bench_test.go
+3 −3 control/control_plane.go
+4 −4 control/dns_control.go
+2 −2 control/tcp.go
+2 −2 control/udp.go
+2 −2 control/udp_endpoint.go
+4 −4 go.mod
+6 −6 go.sum
+1 −1 pkg/trie/trie.go
5 changes: 3 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ require (
github.com/bits-and-blooms/bloom/v3 v3.5.0 // indirect
github.com/cilium/ebpf v0.11.0 // indirect
github.com/daeuniverse/dae-config-dist/go/dae_config v0.0.0-20230604120805-1c27619b592d // indirect
github.com/daeuniverse/softwind v0.0.0-20230805041143-2db4e28c8922 // indirect
github.com/dgryski/go-camellia v0.0.0-20191119043421-69a8a13fb23d // indirect
github.com/dgryski/go-idea v0.0.0-20170306091226-d2fb45a411fb // indirect
github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
Expand All @@ -61,11 +62,11 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mzz2017/disk-bloom v1.0.1 // indirect
github.com/mzz2017/quic-go v0.0.0-20230731153658-2aabc7c97220 // indirect
github.com/mzz2017/quic-go v0.0.0-20230805032040-5e9a02f54eac // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/okzk/sdnotify v0.0.0-20180710141335-d9becc38acbd // indirect
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
github.com/quic-go/qtls-go1-20 v0.3.0 // indirect
github.com/quic-go/qtls-go1-20 v0.3.1 // indirect
github.com/refraction-networking/utls v1.3.2 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/safchain/ethtool v0.3.0 // indirect
Expand Down
10 changes: 6 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ github.com/cilium/ebpf v0.11.0/go.mod h1:WE7CZAnqOL2RouJ4f1uyNhqr2P4CCvXFIqdRDUg
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/daeuniverse/dae-config-dist/go/dae_config v0.0.0-20230604120805-1c27619b592d h1:hnC39MjR7xt5kZjrKlef7DXKFDkiX8MIcDXYC/6Jf9Q=
github.com/daeuniverse/dae-config-dist/go/dae_config v0.0.0-20230604120805-1c27619b592d/go.mod h1:VGWGgv7pCP5WGyHGUyb9+nq/gW0yBm+i/GfCNATOJ1M=
github.com/daeuniverse/softwind v0.0.0-20230805041143-2db4e28c8922 h1:TQkiCTLMY82prw7vfGqOtSCWOuX9MvnCa3g6ufvPgxg=
github.com/daeuniverse/softwind v0.0.0-20230805041143-2db4e28c8922/go.mod h1:hL69hHFjobbgKxTJ5cknnuZT1DCglxdl30uJ3dS8nco=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -100,8 +102,8 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
github.com/mzz2017/disk-bloom v1.0.1 h1:rEF9MiXd9qMW3ibRpqcerLXULoTgRlM21yqqJl1B90M=
github.com/mzz2017/disk-bloom v1.0.1/go.mod h1:JLHETtUu44Z6iBmsqzkOtFlRvXSlKnxjwiBRDapizDI=
github.com/mzz2017/quic-go v0.0.0-20230731153658-2aabc7c97220 h1:StI6iNucfDVrm54yhrHL0Dr1vKC1nBqkok2Itkypvdk=
github.com/mzz2017/quic-go v0.0.0-20230731153658-2aabc7c97220/go.mod h1:+8o4sdYYZCkNfMGiP3oKstpdHeSDFJy84A68evIzhw4=
github.com/mzz2017/quic-go v0.0.0-20230805032040-5e9a02f54eac h1:luSUVeRYonUjk7Pxx8zViDj9Vpf42DZmfR/CbQcXKt0=
github.com/mzz2017/quic-go v0.0.0-20230805032040-5e9a02f54eac/go.mod h1:DBA25b2LoPhrfSzOPE8KcDOicysx00qvvnqe0BpA8DQ=
github.com/mzz2017/softwind v0.0.0-20230803152605-5f1f6bc06934 h1:IAaVbSfNiYP/TuJ4n686SeAwcs+PMvKdzJM5R4Y1rhM=
github.com/mzz2017/softwind v0.0.0-20230803152605-5f1f6bc06934/go.mod h1:TopiWHnL2ty4V4AkNM1nNVdbLlASWdQqploagf4tcKc=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
Expand All @@ -115,8 +117,8 @@ github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/quic-go/qtls-go1-20 v0.3.0 h1:NrCXmDl8BddZwO67vlvEpBTwT89bJfKYygxv4HQvuDk=
github.com/quic-go/qtls-go1-20 v0.3.0/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
github.com/quic-go/qtls-go1-20 v0.3.1 h1:O4BLOM3hwfVF3AcktIylQXyl7Yi2iBNVy5QsV+ySxbg=
github.com/quic-go/qtls-go1-20 v0.3.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
github.com/refraction-networking/utls v1.3.2 h1:o+AkWB57mkcoW36ET7uJ002CpBWHu0KPxi6vzxvPnv8=
github.com/refraction-networking/utls v1.3.2/go.mod h1:fmoaOww2bxzzEpIKOebIsnBvjQpqP7L2vcm/9KUfm/E=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
Expand Down

0 comments on commit 94ccae4

Please sign in to comment.