mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-02-22 12:38:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix/optimize: fix https h2 problem and add h2 mutiplex

Browse Source
This commit is contained in:
mzz2017 2023-03-27 21:44:13 +08:00
parent cc50bea0fc
commit d85e7080fe
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
component/outbound/dialer/dialer.go
View File

@ -86,7 +86,6 @@ func (d *Dialer) Close() error {
d.ticker.Stop()
}
d.tickerMu.Unlock()
close(d.checkCh)
return nil
}

15
control/control_plane.go
View File

@ -740,13 +740,6 @@ func (c *ControlPlane) chooseBestDnsDialer(
bestTarget netip.AddrPort
dialMark uint32
)
if c.log.IsLevelEnabled(logrus.TraceLevel) {
c.log.WithFields(logrus.Fields{
"ipversions": ipversions,
"l4protos": l4protos,
"upstream": dnsUpstream.String(),
}).Traceln("Choose DNS path")
}
// Get the min latency path.
networkType := dialer.NetworkType{
IsDns: true,
@ -805,6 +798,14 @@ func (c *ControlPlane) chooseBestDnsDialer(
if bestDialer == nil {
return nil, fmt.Errorf("no proper dialer for DNS upstream: %v", dnsUpstream.String())
}
if c.log.IsLevelEnabled(logrus.TraceLevel) {
c.log.WithFields(logrus.Fields{
"ipversions": ipversions,
"l4protos": l4protos,
"upstream": dnsUpstream.String(),
"choose": string(l4proto) + "+" + string(ipversion),
}).Traceln("Choose DNS path")
}
switch ipversion {
case consts.IpVersionStr_4:
bestTarget = netip.AddrPortFrom(dnsUpstream.Ip4, dnsUpstream.Port)

3
go.mod
View File

@ -11,7 +11,7 @@ require (
github.com/gorilla/websocket v1.5.0
github.com/json-iterator/go v1.1.12
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
github.com/mzz2017/softwind v0.0.0-20230321095027-720c4011df3a
github.com/mzz2017/softwind v0.0.0-20230327122502-f41e2b2af15b
github.com/okzk/sdnotify v0.0.0-20180710141335-d9becc38acbd
github.com/safchain/ethtool v0.0.0-20230116090318-67cc41908669
github.com/sirupsen/logrus v1.9.0
@ -56,6 +56,7 @@ require (
)
//replace github.com/mzz2017/softwind => /home/mzz/goProjects/softwind
//replace github.com/cloudflare/ahocorasick => /home/mzz/goProjects/ahocorasick
//replace github.com/cilium/ebpf => /home/mzz/goProjects/ebpf
//replace github.com/daeuniverse/dae-config-dist/go/dae_config => /home/mzz/antlrProjects/dae-config/build/go/dae_config

4
go.sum
View File

@ -72,8 +72,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/softwind v0.0.0-20230321095027-720c4011df3a h1:uIKx67Y8lEqRdroh1jHnoMc5fcEUjW4c13IsGzn1NJ4=
github.com/mzz2017/softwind v0.0.0-20230321095027-720c4011df3a/go.mod h1:V8GFOtdpTgzCJtCVXRqjmdDsY+PIhCCx4JpD0zq8Z7I=
github.com/mzz2017/softwind v0.0.0-20230327122502-f41e2b2af15b h1:ZCtM7NOSAV7t7TK3My7uM3U7NG4dv30kFYk/+jyDV8M=
github.com/mzz2017/softwind v0.0.0-20230327122502-f41e2b2af15b/go.mod h1:V8GFOtdpTgzCJtCVXRqjmdDsY+PIhCCx4JpD0zq8Z7I=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=

2
main.go
View File

@ -8,8 +8,8 @@
package main
import (
"github.com/json-iterator/go/extra"
"github.com/daeuniverse/dae/cmd"
"github.com/json-iterator/go/extra"
"net/http"
"os"
"time"