|
|
@@ -40,6 +40,7 @@ func (b *base) ReadConfig(path, version string) error {
|
|
40
|
40
|
func (b *base) makeNetwork(conf *config.Config, version string) (network.Network, error) {
|
|
41
|
41
|
tcpTimeout := conf.Network.Timeout.TCP.Value(network.DefaultTimeout)
|
|
42
|
42
|
idleTimeout := conf.Network.Timeout.Idle.Value(network.DefaultIdleTimeout)
|
|
|
43
|
+ httpTimeout := conf.Network.Timeout.HTTP.Value(network.DefaultHTTPTimeout)
|
|
43
|
44
|
dohIP := conf.Network.DOHIP.Value(net.ParseIP(network.DefaultDOHHostname)).String()
|
|
44
|
45
|
bufferSize := conf.TCPBuffer.Value(network.DefaultBufferSize)
|
|
45
|
46
|
userAgent := "mtg/" + version
|
|
|
@@ -59,14 +60,14 @@ func (b *base) makeNetwork(conf *config.Config, version string) (network.Network
|
|
59
|
60
|
|
|
60
|
61
|
switch len(proxyURLs) {
|
|
61
|
62
|
case 0:
|
|
62
|
|
- return network.NewNetwork(baseDialer, userAgent, dohIP, idleTimeout)
|
|
|
63
|
+ return network.NewNetwork(baseDialer, userAgent, dohIP, httpTimeout, idleTimeout)
|
|
63
|
64
|
case 1:
|
|
64
|
65
|
socksDialer, err := network.NewSocks5Dialer(baseDialer, proxyURLs[0])
|
|
65
|
66
|
if err != nil {
|
|
66
|
67
|
return nil, fmt.Errorf("cannot build socks5 dialer: %w", err)
|
|
67
|
68
|
}
|
|
68
|
69
|
|
|
69
|
|
- return network.NewNetwork(socksDialer, userAgent, dohIP, idleTimeout)
|
|
|
70
|
+ return network.NewNetwork(socksDialer, userAgent, dohIP, httpTimeout, idleTimeout)
|
|
70
|
71
|
}
|
|
71
|
72
|
|
|
72
|
73
|
socksDialer, err := network.NewLoadBalancedSocks5Dialer(baseDialer, proxyURLs)
|
|
|
@@ -74,5 +75,5 @@ func (b *base) makeNetwork(conf *config.Config, version string) (network.Network
|
|
74
|
75
|
return nil, fmt.Errorf("cannot build socks5 dialer: %w", err)
|
|
75
|
76
|
}
|
|
76
|
77
|
|
|
77
|
|
- return network.NewNetwork(socksDialer, userAgent, dohIP, idleTimeout)
|
|
|
78
|
+ return network.NewNetwork(socksDialer, userAgent, dohIP, httpTimeout, idleTimeout)
|
|
78
|
79
|
}
|