From e4a9a9630963dfdc4aa93a0e166948bc87b8b3ad Mon Sep 17 00:00:00 2001 From: 9seconds Date: Tue, 24 Feb 2026 13:31:36 +0100 Subject: [PATCH] Remove mentioning of DC overrides --- example.config.toml | 9 --------- internal/cli/run_proxy.go | 9 --------- internal/config/config.go | 4 ---- internal/config/parse.go | 4 ---- mtglib/internal/dc/view.go | 3 --- mtglib/proxy_opts.go | 2 +- 6 files changed, 1 insertion(+), 30 deletions(-) diff --git a/example.config.toml b/example.config.toml index 68f7926..eaff5de 100644 --- a/example.config.toml +++ b/example.config.toml @@ -80,15 +80,6 @@ tolerate-time-skewness = "5s" # Otherwise, chose a new DC. allow-fallback-on-unknown-dc = false -# Telegram uses different DCs for different purposes. Unfortunately, most of -# DCs are not public, and dependent on a location of the current user, so -# mtg cannot know upfront about all of them, and how to access them. It has -# a default list of DCs, including some CDN IPs, but it is possible that some -# of them are not working for you. In this case, you can override them here. -[[dc-overrides]] -dc = 101 -ips = ["127.0.0.1:443"] - # network defines different network-related settings [network] # please be aware that mtg needs to do some external requests. For diff --git a/internal/cli/run_proxy.go b/internal/cli/run_proxy.go index 23580eb..d9f3d1f 100644 --- a/internal/cli/run_proxy.go +++ b/internal/cli/run_proxy.go @@ -242,14 +242,6 @@ func runProxy(conf *config.Config, version string) error { //nolint: funlen return fmt.Errorf("cannot build ip allowlist: %w", err) } - dcOverrides := map[int][]string{} - for _, override := range conf.DCOverrides { - dcid := override.DC.Get() - for _, addr := range override.IPs { - dcOverrides[dcid] = append(dcOverrides[dcid], addr.Get("")) - } - } - opts := mtglib.ProxyOpts{ Logger: logger, Network: ntw, @@ -264,7 +256,6 @@ func runProxy(conf *config.Config, version string) error { //nolint: funlen AllowFallbackOnUnknownDC: conf.AllowFallbackOnUnknownDC.Get(false), TolerateTimeSkewness: conf.TolerateTimeSkewness.Value, - DCOverrides: dcOverrides, } proxy, err := mtglib.NewProxy(opts) diff --git a/internal/config/config.go b/internal/config/config.go index 74abdf0..0a5a942 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -65,10 +65,6 @@ type Config struct { MetricPrefix TypeMetricPrefix `json:"metricPrefix"` } `json:"prometheus"` } `json:"stats"` - DCOverrides []struct { - DC TypeDC `json:"dc"` - IPs []TypeHostPort `json:"ips"` - } `json:"dcOverrides"` } func (c *Config) Validate() error { diff --git a/internal/config/parse.go b/internal/config/parse.go index 7cdf6da..80fb07c 100644 --- a/internal/config/parse.go +++ b/internal/config/parse.go @@ -60,10 +60,6 @@ type tomlConfig struct { MetricPrefix string `toml:"metric-prefix" json:"metricPrefix,omitempty"` } `toml:"prometheus" json:"prometheus,omitempty"` } `toml:"stats" json:"stats,omitempty"` - DCOverrides []struct { - DC uint `toml:"dc" json:"dc"` - IPs []string `toml:"ips" json:"ips"` - } `toml:"dc-overrides" json:"dcOverrides,omitempty"` } func Parse(rawData []byte) (*Config, error) { diff --git a/mtglib/internal/dc/view.go b/mtglib/internal/dc/view.go index de06499..e4980a7 100644 --- a/mtglib/internal/dc/view.go +++ b/mtglib/internal/dc/view.go @@ -2,12 +2,10 @@ package dc type dcView struct { publicConfigs dcAddrSet - ownConfigs dcAddrSet } func (d dcView) getV4(dc int) []Addr { addrs := d.publicConfigs.getV4(dc) - addrs = append(addrs, d.ownConfigs.getV4(dc)...) addrs = append(addrs, defaultDCAddrSet.getV4(dc)...) return addrs @@ -15,7 +13,6 @@ func (d dcView) getV4(dc int) []Addr { func (d dcView) getV6(dc int) []Addr { addrs := d.publicConfigs.getV6(dc) - addrs = append(addrs, d.ownConfigs.getV6(dc)...) addrs = append(addrs, defaultDCAddrSet.getV6(dc)...) return addrs diff --git a/mtglib/proxy_opts.go b/mtglib/proxy_opts.go index 53f3434..0399d80 100644 --- a/mtglib/proxy_opts.go +++ b/mtglib/proxy_opts.go @@ -117,7 +117,7 @@ type ProxyOpts struct { // DCOverrides defines a set of IP addresses that should be used // with a higher priority to those that are calculated somehow by mtg. // - // This is an optional setting + // OBSOLETE and DEPRECATED. Ignored. DCOverrides map[int][]string }