ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-09-01 05:14:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change network to accept DialFunc

Browse Source
This commit is contained in:
9seconds
2021-03-11 06:08:15 +03:00
parent 6b28488fbd
commit d6566e5dfb
18 changed files with 67 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/base.go
+7 -6
View File
@@ -15,7 +15,7 @@ type base struct {
conf *config.Config
}
func (b *base) ReadConfig(path string) error {
func (b *base) ReadConfig(path, version string) error {
content, err := ioutil.ReadFile(path)
if err != nil {
return fmt.Errorf("cannot read config file: %w", err)
@@ -26,7 +26,7 @@ func (b *base) ReadConfig(path string) error {
return fmt.Errorf("cannot parse config: %w", err)
}
ntw, err := b.makeNetwork(conf)
ntw, err := b.makeNetwork(conf, version)
if err != nil {
return fmt.Errorf("cannot build a network: %w", err)
}
@@ -37,11 +37,12 @@ func (b *base) ReadConfig(path string) error {
return nil
}
func (b *base) makeNetwork(conf *config.Config) (network.Network, error) {
func (b *base) makeNetwork(conf *config.Config, version string) (network.Network, error) {
tcpTimeout := conf.Network.Timeout.TCP.Value(network.DefaultTimeout)
idleTimeout := conf.Network.Timeout.Idle.Value(network.DefaultIdleTimeout)
dohIP := conf.Network.DOHIP.Value(net.ParseIP(network.DefaultDOHHostname)).String()
bufferSize := conf.TCPBuffer.Value(network.DefaultBufferSize)
userAgent := "mtg/" + version
baseDialer, err := network.NewDefaultDialer(tcpTimeout, int(bufferSize))
if err != nil {
@@ -58,14 +59,14 @@ func (b *base) makeNetwork(conf *config.Config) (network.Network, error) {
switch len(proxyURLs) {
case 0:
return network.NewNetwork(baseDialer, dohIP, idleTimeout)
return network.NewNetwork(baseDialer, userAgent, dohIP, idleTimeout)
case 1:
socksDialer, err := network.NewSocks5Dialer(baseDialer, proxyURLs[0])
if err != nil {
return nil, fmt.Errorf("cannot build socks5 dialer: %w", err)
}
return network.NewNetwork(socksDialer, dohIP, idleTimeout)
return network.NewNetwork(socksDialer, userAgent, dohIP, idleTimeout)
}
socksDialer, err := network.NewLoadBalancedSocks5Dialer(baseDialer, proxyURLs)
@@ -73,5 +74,5 @@ func (b *base) makeNetwork(conf *config.Config) (network.Network, error) {
return nil, fmt.Errorf("cannot build socks5 dialer: %w", err)
}
return network.NewNetwork(socksDialer, dohIP, idleTimeout)
return network.NewNetwork(socksDialer, userAgent, dohIP, idleTimeout)
}