Просмотр исходного кода

Remove mentioning of DC overrides

tags/v2.1.11^2^2
9seconds 2 месяцев назад
Родитель
Сommit
e4a9a96309
6 измененных файлов: 1 добавлений и 30 удалений
  1. 0
    9
      example.config.toml
  2. 0
    9
      internal/cli/run_proxy.go
  3. 0
    4
      internal/config/config.go
  4. 0
    4
      internal/config/parse.go
  5. 0
    3
      mtglib/internal/dc/view.go
  6. 1
    1
      mtglib/proxy_opts.go

+ 0
- 9
example.config.toml Просмотреть файл

80
 # Otherwise, chose a new DC.
80
 # Otherwise, chose a new DC.
81
 allow-fallback-on-unknown-dc = false
81
 allow-fallback-on-unknown-dc = false
82
 
82
 
83
-# Telegram uses different DCs for different purposes. Unfortunately, most of
84
-# DCs are not public, and dependent on a location of the current user, so
85
-# mtg cannot know upfront about all of them, and how to access them. It has
86
-# a default list of DCs, including some CDN IPs, but it is possible that some
87
-# of them are not working for you. In this case, you can override them here.
88
-[[dc-overrides]]
89
-dc = 101
90
-ips = ["127.0.0.1:443"]
91
-
92
 # network defines different network-related settings
83
 # network defines different network-related settings
93
 [network]
84
 [network]
94
 # please be aware that mtg needs to do some external requests. For
85
 # please be aware that mtg needs to do some external requests. For

+ 0
- 9
internal/cli/run_proxy.go Просмотреть файл

242
 		return fmt.Errorf("cannot build ip allowlist: %w", err)
242
 		return fmt.Errorf("cannot build ip allowlist: %w", err)
243
 	}
243
 	}
244
 
244
 
245
-	dcOverrides := map[int][]string{}
246
-	for _, override := range conf.DCOverrides {
247
-		dcid := override.DC.Get()
248
-		for _, addr := range override.IPs {
249
-			dcOverrides[dcid] = append(dcOverrides[dcid], addr.Get(""))
250
-		}
251
-	}
252
-
253
 	opts := mtglib.ProxyOpts{
245
 	opts := mtglib.ProxyOpts{
254
 		Logger:          logger,
246
 		Logger:          logger,
255
 		Network:         ntw,
247
 		Network:         ntw,
264
 
256
 
265
 		AllowFallbackOnUnknownDC: conf.AllowFallbackOnUnknownDC.Get(false),
257
 		AllowFallbackOnUnknownDC: conf.AllowFallbackOnUnknownDC.Get(false),
266
 		TolerateTimeSkewness:     conf.TolerateTimeSkewness.Value,
258
 		TolerateTimeSkewness:     conf.TolerateTimeSkewness.Value,
267
-		DCOverrides:              dcOverrides,
268
 	}
259
 	}
269
 
260
 
270
 	proxy, err := mtglib.NewProxy(opts)
261
 	proxy, err := mtglib.NewProxy(opts)

+ 0
- 4
internal/config/config.go Просмотреть файл

65
 			MetricPrefix TypeMetricPrefix `json:"metricPrefix"`
65
 			MetricPrefix TypeMetricPrefix `json:"metricPrefix"`
66
 		} `json:"prometheus"`
66
 		} `json:"prometheus"`
67
 	} `json:"stats"`
67
 	} `json:"stats"`
68
-	DCOverrides []struct {
69
-		DC  TypeDC         `json:"dc"`
70
-		IPs []TypeHostPort `json:"ips"`
71
-	} `json:"dcOverrides"`
72
 }
68
 }
73
 
69
 
74
 func (c *Config) Validate() error {
70
 func (c *Config) Validate() error {

+ 0
- 4
internal/config/parse.go Просмотреть файл

60
 			MetricPrefix string `toml:"metric-prefix" json:"metricPrefix,omitempty"`
60
 			MetricPrefix string `toml:"metric-prefix" json:"metricPrefix,omitempty"`
61
 		} `toml:"prometheus" json:"prometheus,omitempty"`
61
 		} `toml:"prometheus" json:"prometheus,omitempty"`
62
 	} `toml:"stats" json:"stats,omitempty"`
62
 	} `toml:"stats" json:"stats,omitempty"`
63
-	DCOverrides []struct {
64
-		DC  uint     `toml:"dc" json:"dc"`
65
-		IPs []string `toml:"ips" json:"ips"`
66
-	} `toml:"dc-overrides" json:"dcOverrides,omitempty"`
67
 }
63
 }
68
 
64
 
69
 func Parse(rawData []byte) (*Config, error) {
65
 func Parse(rawData []byte) (*Config, error) {

+ 0
- 3
mtglib/internal/dc/view.go Просмотреть файл

2
 
2
 
3
 type dcView struct {
3
 type dcView struct {
4
 	publicConfigs dcAddrSet
4
 	publicConfigs dcAddrSet
5
-	ownConfigs    dcAddrSet
6
 }
5
 }
7
 
6
 
8
 func (d dcView) getV4(dc int) []Addr {
7
 func (d dcView) getV4(dc int) []Addr {
9
 	addrs := d.publicConfigs.getV4(dc)
8
 	addrs := d.publicConfigs.getV4(dc)
10
-	addrs = append(addrs, d.ownConfigs.getV4(dc)...)
11
 	addrs = append(addrs, defaultDCAddrSet.getV4(dc)...)
9
 	addrs = append(addrs, defaultDCAddrSet.getV4(dc)...)
12
 
10
 
13
 	return addrs
11
 	return addrs
15
 
13
 
16
 func (d dcView) getV6(dc int) []Addr {
14
 func (d dcView) getV6(dc int) []Addr {
17
 	addrs := d.publicConfigs.getV6(dc)
15
 	addrs := d.publicConfigs.getV6(dc)
18
-	addrs = append(addrs, d.ownConfigs.getV6(dc)...)
19
 	addrs = append(addrs, defaultDCAddrSet.getV6(dc)...)
16
 	addrs = append(addrs, defaultDCAddrSet.getV6(dc)...)
20
 
17
 
21
 	return addrs
18
 	return addrs

+ 1
- 1
mtglib/proxy_opts.go Просмотреть файл

117
 	// DCOverrides defines a set of IP addresses that should be used
117
 	// DCOverrides defines a set of IP addresses that should be used
118
 	// with a higher priority to those that are calculated somehow by mtg.
118
 	// with a higher priority to those that are calculated somehow by mtg.
119
 	//
119
 	//
120
-	// This is an optional setting
120
+	// OBSOLETE and DEPRECATED. Ignored.
121
 	DCOverrides map[int][]string
121
 	DCOverrides map[int][]string
122
 }
122
 }
123
 
123
 

Загрузка…
Отмена
Сохранить