Selaa lähdekoodia

Merge pull request #397 from 9seconds/doctor

tags/v2.2.4^2
Sergei Arkhipov 1 kuukausi sitten
vanhempi
commit
fb390d3417
No account linked to committer's email address
10 muutettua tiedostoa jossa 491 lisäystä ja 91 poistoa
  1. 30
    0
      essentials/addresses.go
  2. 1
    0
      go.mod
  3. 2
    0
      go.sum
  4. 2
    47
      internal/cli/access.go
  5. 1
    0
      internal/cli/cli.go
  6. 368
    0
      internal/cli/doctor.go
  7. 51
    0
      internal/cli/utils.go
  8. BIN
      mtg-linux
  9. 36
    43
      mtglib/internal/dc/init.go
  10. 0
    1
      run_profile.go

+ 30
- 0
essentials/addresses.go Näytä tiedosto

@@ -0,0 +1,30 @@
1
+package essentials
2
+
3
+// TelegramCoreAddresses are publicly known addresses of Telegram core network.
4
+var TelegramCoreAddresses = map[int][]string{
5
+	1: {
6
+		"149.154.175.50:443",
7
+		"[2001:b28:f23d:f001::a]:443",
8
+	},
9
+	2: {
10
+		"149.154.167.51:443",
11
+		"95.161.76.100:443",
12
+		"[2001:67c:04e8:f002::a]:443",
13
+	},
14
+	3: {
15
+		"149.154.175.100:443",
16
+		"[2001:b28:f23d:f003::a]:443",
17
+	},
18
+	4: {
19
+		"149.154.167.91:443",
20
+		"[2001:67c:04e8:f004::a]:443",
21
+	},
22
+	5: {
23
+		"149.154.171.5:443",
24
+		"[2001:b28:f23f:f005::a]:443",
25
+	},
26
+	203: {
27
+		"91.105.192.100:443",
28
+		"[2a0a:f280:0203:000a:5000:0000:0000:0100]:443",
29
+	},
30
+}

+ 1
- 0
go.mod Näytä tiedosto

@@ -27,6 +27,7 @@ require (
27 27
 )
28 28
 
29 29
 require (
30
+	github.com/beevik/ntp v1.5.0
30 31
 	github.com/ncruces/go-dns v1.3.2
31 32
 	github.com/pelletier/go-toml/v2 v2.2.4
32 33
 	github.com/pires/go-proxyproto v0.11.0

+ 2
- 0
go.sum Näytä tiedosto

@@ -12,6 +12,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
12 12
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
13 13
 github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6 h1:4NNbNM2Iq/k57qEu7WfL67UrbPq1uFWxW4qODCohi+0=
14 14
 github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6/go.mod h1:J29hk+f9lJrblVIfiJOtTFk+OblBawmib4uz/VdKzlg=
15
+github.com/beevik/ntp v1.5.0 h1:y+uj/JjNwlY2JahivxYvtmv4ehfi3h74fAuABB9ZSM4=
16
+github.com/beevik/ntp v1.5.0/go.mod h1:mJEhBrwT76w9D+IfOEGvuzyuudiW9E52U2BaTrMOYow=
15 17
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
16 18
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
17 19
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

+ 2
- 47
internal/cli/access.go Näytä tiedosto

@@ -1,22 +1,16 @@
1 1
 package cli
2 2
 
3 3
 import (
4
-	"context"
5 4
 	"encoding/json"
6 5
 	"fmt"
7
-	"io"
8 6
 	"net"
9
-	"net/http"
10 7
 	"net/url"
11 8
 	"os"
12 9
 	"strconv"
13
-	"strings"
14 10
 	"sync"
15 11
 
16
-	"github.com/9seconds/mtg/v2/essentials"
17 12
 	"github.com/9seconds/mtg/v2/internal/config"
18 13
 	"github.com/9seconds/mtg/v2/internal/utils"
19
-	"github.com/9seconds/mtg/v2/mtglib"
20 14
 )
21 15
 
22 16
 type accessResponse struct {
@@ -65,7 +59,7 @@ func (a *Access) Run(cli *CLI, version string) error {
65 59
 	wg.Go(func() {
66 60
 		ip := a.PublicIPv4
67 61
 		if ip == nil {
68
-			ip = a.getIP(ntw, "tcp4")
62
+			ip = getIP(ntw, "tcp4")
69 63
 		}
70 64
 
71 65
 		if ip != nil {
@@ -77,7 +71,7 @@ func (a *Access) Run(cli *CLI, version string) error {
77 71
 	wg.Go(func() {
78 72
 		ip := a.PublicIPv6
79 73
 		if ip == nil {
80
-			ip = a.getIP(ntw, "tcp6")
74
+			ip = getIP(ntw, "tcp6")
81 75
 		}
82 76
 
83 77
 		if ip != nil {
@@ -100,45 +94,6 @@ func (a *Access) Run(cli *CLI, version string) error {
100 94
 	return nil
101 95
 }
102 96
 
103
-func (a *Access) getIP(ntw mtglib.Network, protocol string) net.IP {
104
-	dialer := ntw.NativeDialer()
105
-	client := ntw.MakeHTTPClient(func(ctx context.Context, network, address string) (essentials.Conn, error) {
106
-		conn, err := dialer.DialContext(ctx, protocol, address)
107
-		if err != nil {
108
-			return nil, err
109
-		}
110
-		return essentials.WrapNetConn(conn), err
111
-	})
112
-
113
-	req, err := http.NewRequest(http.MethodGet, "https://ifconfig.co", nil) //nolint: noctx
114
-	if err != nil {
115
-		panic(err)
116
-	}
117
-
118
-	req.Header.Add("Accept", "text/plain")
119
-
120
-	resp, err := client.Do(req)
121
-	if err != nil {
122
-		return nil
123
-	}
124
-
125
-	if resp.StatusCode != http.StatusOK {
126
-		return nil
127
-	}
128
-
129
-	defer func() {
130
-		io.Copy(io.Discard, resp.Body) //nolint: errcheck
131
-		resp.Body.Close()              //nolint: errcheck
132
-	}()
133
-
134
-	data, err := io.ReadAll(resp.Body)
135
-	if err != nil {
136
-		return nil
137
-	}
138
-
139
-	return net.ParseIP(strings.TrimSpace(string(data)))
140
-}
141
-
142 97
 func (a *Access) makeURLs(conf *config.Config, ip net.IP) *accessResponseURLs {
143 98
 	if ip == nil {
144 99
 		return nil

+ 1
- 0
internal/cli/cli.go Näytä tiedosto

@@ -4,6 +4,7 @@ import "github.com/alecthomas/kong"
4 4
 
5 5
 type CLI struct {
6 6
 	GenerateSecret GenerateSecret   `kong:"cmd,help='Generate new proxy secret'"`
7
+	Doctor         Doctor           `kong:"cmd,help='Check that proxy can run correctly'"`
7 8
 	Access         Access           `kong:"cmd,help='Print access information.'"`
8 9
 	Run            Run              `kong:"cmd,help='Run proxy.'"`
9 10
 	SimpleRun      SimpleRun        `kong:"cmd,help='Run proxy without config file.'"`

+ 368
- 0
internal/cli/doctor.go Näytä tiedosto

@@ -0,0 +1,368 @@
1
+package cli
2
+
3
+import (
4
+	"context"
5
+	"errors"
6
+	"fmt"
7
+	"maps"
8
+	"net"
9
+	"os"
10
+	"slices"
11
+	"strconv"
12
+	"strings"
13
+	"text/template"
14
+	"time"
15
+
16
+	"github.com/9seconds/mtg/v2/essentials"
17
+	"github.com/9seconds/mtg/v2/internal/config"
18
+	"github.com/9seconds/mtg/v2/internal/utils"
19
+	"github.com/9seconds/mtg/v2/mtglib"
20
+	"github.com/9seconds/mtg/v2/network/v2"
21
+	"github.com/beevik/ntp"
22
+)
23
+
24
+var (
25
+	tplError = template.Must(
26
+		template.New("").Parse("  ‼️ {{ .description }}: {{ .error }}\n"),
27
+	)
28
+
29
+	tplWDeprecatedConfig = template.Must(
30
+		template.New("").
31
+			Parse(`  ⚠️ Option {{ .old | printf "%q" }}{{ if .old_section }} from section [{{ .old_section }}]{{ end }} is deprecated and will be removed in v{{ .when }}. Please use {{ .new | printf "%q" }}{{ if .new_section }} in [{{ .new_section }}] section{{ end }} instead.` + "\n"),
32
+	)
33
+
34
+	tplOTimeSkewness = template.Must(
35
+		template.New("").
36
+			Parse("  ✅ Time drift is {{ .drift }}, but tolerate-time-skewness is {{ .value }}\n"),
37
+	)
38
+	tplWTimeSkewness = template.Must(
39
+		template.New("").
40
+			Parse("  ⚠️ Time drift is {{ .drift }}, but tolerate-time-skewness is {{ .value }}. Please check ntp.\n"),
41
+	)
42
+	tplETimeSkewness = template.Must(
43
+		template.New("").
44
+			Parse("  ❌ Time drift is {{ .drift }}, but tolerate-time-skewness is {{ .value }}. You will get many rejected connections!\n"),
45
+	)
46
+
47
+	tplODCConnect = template.Must(
48
+		template.New("").Parse("  ✅ DC {{ .dc }}\n"),
49
+	)
50
+	tplEDCConnect = template.Must(
51
+		template.New("").Parse("  ❌ DC {{ .dc }}: {{ .error }}\n"),
52
+	)
53
+
54
+	tplODNSSNIMatch = template.Must(
55
+		template.New("").Parse("  ✅ IP address {{ .ip }} matches secret hostname {{ .hostname }}\n"),
56
+	)
57
+	tplEDNSSNIMatch = template.Must(
58
+		template.New("").Parse("  ❌ Hostname {{ .hostname }} {{ if .resolved }}is resolved to {{ .resolved }} addresses, not {{ if .ip4 }}{{ .ip4 }}{{ else }}{{ .ip6 }}{{ end }}{{ else }}cannot be resolved to any host{{ end }}\n"),
59
+	)
60
+
61
+	tplOFrontingDomain = template.Must(
62
+		template.New("").Parse("  ✅ {{ .address }} is reachable\n"),
63
+	)
64
+	tplEFrontingDomain = template.Must(
65
+		template.New("").Parse("  ❌ {{ .address }}: {{ .error }}\n"),
66
+	)
67
+)
68
+
69
+type Doctor struct {
70
+	conf *config.Config
71
+
72
+	ConfigPath string `kong:"arg,required,type='existingfile',help='Path to the configuration file.',name='config-path'"` //nolint: lll
73
+}
74
+
75
+func (d *Doctor) Run(cli *CLI, version string) error {
76
+	conf, err := utils.ReadConfig(d.ConfigPath)
77
+	if err != nil {
78
+		return fmt.Errorf("cannot init config: %w", err)
79
+	}
80
+
81
+	d.conf = conf
82
+
83
+	fmt.Println("Deprecated options")
84
+	everythingOK := d.checkDeprecatedConfig()
85
+
86
+	fmt.Println("Time skewness")
87
+	everythingOK = d.checkTimeSkewness() && everythingOK
88
+
89
+	resolver, err := network.GetDNS(conf.GetDNS())
90
+	if err != nil {
91
+		return fmt.Errorf("cannot create DNS resolver: %w", err)
92
+	}
93
+
94
+	base := network.New(
95
+		resolver,
96
+		"",
97
+		conf.Network.Timeout.TCP.Get(10*time.Second),
98
+		conf.Network.Timeout.HTTP.Get(0),
99
+		conf.Network.Timeout.Idle.Get(0),
100
+	)
101
+
102
+	fmt.Println("Validate native network connectivity")
103
+	everythingOK = d.checkNetwork(base) && everythingOK
104
+
105
+	for _, url := range conf.Network.Proxies {
106
+		value, err := network.NewProxyNetwork(base, url.Get(nil))
107
+		if err != nil {
108
+			return err
109
+		}
110
+
111
+		fmt.Printf("Validate network connectivity with proxy %s\n", url.Get(nil))
112
+		everythingOK = d.checkNetwork(value) && everythingOK
113
+	}
114
+
115
+	fmt.Println("Validate fronting domain connectivity")
116
+	everythingOK = d.checkFrontingDomain(base) && everythingOK
117
+
118
+	fmt.Println("Validate SNI-DNS match")
119
+	everythingOK = d.checkSecretHost(resolver, base) && everythingOK
120
+
121
+	if !everythingOK {
122
+		os.Exit(1)
123
+	}
124
+
125
+	return nil
126
+}
127
+
128
+func (d *Doctor) checkDeprecatedConfig() bool {
129
+	ok := true
130
+
131
+	if d.conf.DomainFrontingIP.Value != nil {
132
+		ok = false
133
+		tplWDeprecatedConfig.Execute(os.Stdout, map[string]string{ //nolint: errcheck
134
+			"when":        "2.3.0",
135
+			"old":         "domain-fronting-ip",
136
+			"old_section": "",
137
+			"new":         "ip",
138
+			"new_section": "domain-fronting",
139
+		})
140
+	}
141
+
142
+	if d.conf.DomainFrontingPort.Value != 0 {
143
+		ok = false
144
+		tplWDeprecatedConfig.Execute(os.Stdout, map[string]string{ //nolint: errcheck
145
+			"when":        "2.3.0",
146
+			"old":         "domain-fronting-port",
147
+			"old_section": "",
148
+			"new":         "port",
149
+			"new_section": "domain-fronting",
150
+		})
151
+	}
152
+
153
+	if d.conf.DomainFrontingProxyProtocol.Value {
154
+		ok = false
155
+		tplWDeprecatedConfig.Execute(os.Stdout, map[string]string{ //nolint: errcheck
156
+			"when":        "2.3.0",
157
+			"old":         "domain-fronting-proxy-protocol",
158
+			"old_section": "",
159
+			"new":         "proxy-protocol",
160
+			"new_section": "domain-fronting",
161
+		})
162
+	}
163
+
164
+	if d.conf.Network.DOHIP.Value != nil {
165
+		ok = false
166
+		tplWDeprecatedConfig.Execute(os.Stdout, map[string]string{ //nolint: errcheck
167
+			"when":        "2.3.0",
168
+			"old":         "doh-ip",
169
+			"old_section": "network",
170
+			"new":         "dns",
171
+			"new_section": "network",
172
+		})
173
+	}
174
+
175
+	if ok {
176
+		fmt.Println("  ✅ All good")
177
+	}
178
+
179
+	return ok
180
+}
181
+
182
+func (d *Doctor) checkTimeSkewness() bool {
183
+	response, err := ntp.Query("0.pool.ntp.org")
184
+	if err != nil {
185
+		tplError.Execute(os.Stdout, map[string]any{ //nolint: errcheck
186
+			"description": "cannot access ntp pool",
187
+			"error":       err,
188
+		})
189
+		return false
190
+	}
191
+
192
+	skewness := response.ClockOffset.Abs()
193
+	confValue := d.conf.TolerateTimeSkewness.Get(mtglib.DefaultTolerateTimeSkewness)
194
+	diff := float64(skewness) / float64(confValue)
195
+	tplData := map[string]any{
196
+		"drift": response.ClockOffset,
197
+		"value": confValue,
198
+	}
199
+
200
+	switch {
201
+	case diff < 0.3:
202
+		tplOTimeSkewness.Execute(os.Stdout, tplData) //nolint: errcheck
203
+		return true
204
+	case diff < 0.7:
205
+		tplWTimeSkewness.Execute(os.Stdout, tplData) //nolint: errcheck
206
+	default:
207
+		tplETimeSkewness.Execute(os.Stdout, tplData) //nolint: errcheck
208
+	}
209
+
210
+	return false
211
+}
212
+
213
+func (d *Doctor) checkNetwork(ntw mtglib.Network) bool {
214
+	dcs := slices.Collect(maps.Keys(essentials.TelegramCoreAddresses))
215
+	slices.Sort(dcs)
216
+
217
+	ok := true
218
+
219
+	for _, dc := range dcs {
220
+		err := d.checkNetworkAddresses(ntw, essentials.TelegramCoreAddresses[dc])
221
+		if err == nil {
222
+			tplODCConnect.Execute(os.Stdout, map[string]any{ //nolint: errcheck
223
+				"dc": dc,
224
+			})
225
+		} else {
226
+			tplEDCConnect.Execute(os.Stdout, map[string]any{ //nolint: errcheck
227
+				"dc":    dc,
228
+				"error": err,
229
+			})
230
+			ok = false
231
+		}
232
+	}
233
+
234
+	return ok
235
+}
236
+
237
+func (d *Doctor) checkNetworkAddresses(ntw mtglib.Network, addresses []string) error {
238
+	checkAddresses := []string{}
239
+
240
+	switch d.conf.PreferIP.Get("prefer-ip4") {
241
+	case "only-ipv4":
242
+		for _, addr := range addresses {
243
+			host, _, err := net.SplitHostPort(addr)
244
+			if err != nil {
245
+				panic(err)
246
+			}
247
+
248
+			if ip := net.ParseIP(host); ip != nil && ip.To4() != nil {
249
+				checkAddresses = append(checkAddresses, addr)
250
+			}
251
+		}
252
+	case "only-ipv6":
253
+		for _, addr := range addresses {
254
+			host, _, err := net.SplitHostPort(addr)
255
+			if err != nil {
256
+				panic(err)
257
+			}
258
+
259
+			if ip := net.ParseIP(host); ip != nil && ip.To4() == nil {
260
+				checkAddresses = append(checkAddresses, addr)
261
+			}
262
+		}
263
+	default:
264
+		checkAddresses = addresses
265
+	}
266
+
267
+	if len(checkAddresses) == 0 {
268
+		return fmt.Errorf("no suitable addresses after IP version filtering")
269
+	}
270
+
271
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
272
+	defer cancel()
273
+
274
+	var (
275
+		conn net.Conn
276
+		err  error
277
+	)
278
+
279
+	for _, addr := range checkAddresses {
280
+		conn, err = ntw.DialContext(ctx, "tcp", addr)
281
+		if err != nil {
282
+			continue
283
+		}
284
+
285
+		conn.Close() //nolint: errcheck
286
+
287
+		return nil
288
+	}
289
+
290
+	return err
291
+}
292
+
293
+func (d *Doctor) checkFrontingDomain(ntw mtglib.Network) bool {
294
+	host := d.conf.Secret.Host
295
+	if ip := d.conf.GetDomainFrontingIP(nil); ip != "" {
296
+		host = ip
297
+	}
298
+
299
+	port := d.conf.GetDomainFrontingPort(mtglib.DefaultDomainFrontingPort)
300
+	address := net.JoinHostPort(host, strconv.Itoa(int(port)))
301
+
302
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
303
+	defer cancel()
304
+
305
+	dialer := ntw.NativeDialer()
306
+
307
+	conn, err := dialer.DialContext(ctx, "tcp", address)
308
+	if err != nil {
309
+		tplEFrontingDomain.Execute(os.Stdout, map[string]any{ //nolint: errcheck
310
+			"address": address,
311
+			"error":   err,
312
+		})
313
+		return false
314
+	}
315
+
316
+	conn.Close() //nolint: errcheck
317
+
318
+	tplOFrontingDomain.Execute(os.Stdout, map[string]any{ //nolint: errcheck
319
+		"address": address,
320
+	})
321
+
322
+	return true
323
+}
324
+
325
+func (d *Doctor) checkSecretHost(resolver *net.Resolver, ntw mtglib.Network) bool {
326
+	addresses, err := resolver.LookupIPAddr(context.Background(), d.conf.Secret.Host)
327
+	if err != nil {
328
+		tplError.Execute(os.Stdout, map[string]any{ //nolint: errcheck
329
+			"description": fmt.Sprintf("cannot resolve DNS name of %s", d.conf.Secret.Host),
330
+			"error":       err,
331
+		})
332
+		return false
333
+	}
334
+
335
+	ourIP4 := getIP(ntw, "tcp4")
336
+	ourIP6 := getIP(ntw, "tcp6")
337
+
338
+	if ourIP4 == nil && ourIP6 == nil {
339
+		tplError.Execute(os.Stdout, map[string]any{ //nolint: errcheck
340
+			"description": "cannot detect public IP address",
341
+			"error":       errors.New("ifconfig.co is unreachable for both IPv4 and IPv6"),
342
+		})
343
+		return false
344
+	}
345
+
346
+	strAddresses := []string{}
347
+	for _, value := range addresses {
348
+		if (ourIP4 != nil && value.IP.String() == ourIP4.String()) ||
349
+			(ourIP6 != nil && value.IP.String() == ourIP6.String()) {
350
+			tplODNSSNIMatch.Execute(os.Stdout, map[string]any{ //nolint: errcheck
351
+				"ip":       value.IP,
352
+				"hostname": d.conf.Secret.Host,
353
+			})
354
+			return true
355
+		}
356
+
357
+		strAddresses = append(strAddresses, `"`+value.IP.String()+`"`)
358
+	}
359
+
360
+	tplEDNSSNIMatch.Execute(os.Stdout, map[string]any{ //nolint: errcheck
361
+		"hostname": d.conf.Secret.Host,
362
+		"resolved": strings.Join(strAddresses, ", "),
363
+		"ip4":      ourIP4,
364
+		"ip6":      ourIP6,
365
+	})
366
+
367
+	return false
368
+}

+ 51
- 0
internal/cli/utils.go Näytä tiedosto

@@ -0,0 +1,51 @@
1
+package cli
2
+
3
+import (
4
+	"context"
5
+	"io"
6
+	"net"
7
+	"net/http"
8
+	"strings"
9
+
10
+	"github.com/9seconds/mtg/v2/essentials"
11
+	"github.com/9seconds/mtg/v2/mtglib"
12
+)
13
+
14
+func getIP(ntw mtglib.Network, protocol string) net.IP {
15
+	dialer := ntw.NativeDialer()
16
+	client := ntw.MakeHTTPClient(func(ctx context.Context, network, address string) (essentials.Conn, error) {
17
+		conn, err := dialer.DialContext(ctx, protocol, address)
18
+		if err != nil {
19
+			return nil, err
20
+		}
21
+		return essentials.WrapNetConn(conn), err
22
+	})
23
+
24
+	req, err := http.NewRequest(http.MethodGet, "https://ifconfig.co", nil) //nolint: noctx
25
+	if err != nil {
26
+		panic(err)
27
+	}
28
+
29
+	req.Header.Add("Accept", "text/plain")
30
+
31
+	resp, err := client.Do(req)
32
+	if err != nil {
33
+		return nil
34
+	}
35
+
36
+	if resp.StatusCode != http.StatusOK {
37
+		return nil
38
+	}
39
+
40
+	defer func() {
41
+		io.Copy(io.Discard, resp.Body) //nolint: errcheck
42
+		resp.Body.Close()              //nolint: errcheck
43
+	}()
44
+
45
+	data, err := io.ReadAll(resp.Body)
46
+	if err != nil {
47
+		return nil
48
+	}
49
+
50
+	return net.ParseIP(strings.TrimSpace(string(data)))
51
+}

BIN
mtg-linux Näytä tiedosto


+ 36
- 43
mtglib/internal/dc/init.go Näytä tiedosto

@@ -2,7 +2,10 @@ package dc
2 2
 
3 3
 import (
4 4
 	"context"
5
+	"net"
5 6
 	"time"
7
+
8
+	"github.com/9seconds/mtg/v2/essentials"
6 9
 )
7 10
 
8 11
 type preferIP uint8
@@ -39,46 +42,36 @@ type Updater interface {
39 42
 }
40 43
 
41 44
 // https://github.com/telegramdesktop/tdesktop/blob/master/Telegram/SourceFiles/mtproto/mtproto_dc_options.cpp#L30
42
-var defaultDCAddrSet = dcAddrSet{
43
-	v4: map[int][]Addr{
44
-		1: {
45
-			{Network: "tcp4", Address: "149.154.175.50:443"},
46
-		},
47
-		2: {
48
-			{Network: "tcp4", Address: "149.154.167.51:443"},
49
-			{Network: "tcp4", Address: "95.161.76.100:443"},
50
-		},
51
-		3: {
52
-			{Network: "tcp4", Address: "149.154.175.100:443"},
53
-		},
54
-		4: {
55
-			{Network: "tcp4", Address: "149.154.167.91:443"},
56
-		},
57
-		5: {
58
-			{Network: "tcp4", Address: "149.154.171.5:443"},
59
-		},
60
-		203: {
61
-			{Network: "tcp4", Address: "91.105.192.100:443"},
62
-		},
63
-	},
64
-	v6: map[int][]Addr{
65
-		1: {
66
-			{Network: "tcp6", Address: "[2001:b28:f23d:f001::a]:443"},
67
-		},
68
-		2: {
69
-			{Network: "tcp6", Address: "[2001:67c:04e8:f002::a]:443"},
70
-		},
71
-		3: {
72
-			{Network: "tcp6", Address: "[2001:b28:f23d:f003::a]:443"},
73
-		},
74
-		4: {
75
-			{Network: "tcp6", Address: "[2001:67c:04e8:f004::a]:443"},
76
-		},
77
-		5: {
78
-			{Network: "tcp6", Address: "[2001:b28:f23f:f005::a]:443"},
79
-		},
80
-		203: {
81
-			{Network: "tcp6", Address: "[2a0a:f280:0203:000a:5000:0000:0000:0100]:443"},
82
-		},
83
-	},
84
-}
45
+var defaultDCAddrSet = (func() dcAddrSet {
46
+	addrSet := dcAddrSet{
47
+		v4: make(map[int][]Addr),
48
+		v6: make(map[int][]Addr),
49
+	}
50
+
51
+	for dcid, ips := range essentials.TelegramCoreAddresses {
52
+		for _, addr := range ips {
53
+			host, _, err := net.SplitHostPort(addr)
54
+			if err != nil {
55
+				panic(err)
56
+			}
57
+
58
+			ip := net.ParseIP(host)
59
+			if ip == nil {
60
+				panic(addr)
61
+			}
62
+			if ip.To4() == nil {
63
+				addrSet.v6[dcid] = append(addrSet.v6[dcid], Addr{
64
+					Network: "tcp6",
65
+					Address: addr,
66
+				})
67
+			} else {
68
+				addrSet.v4[dcid] = append(addrSet.v4[dcid], Addr{
69
+					Network: "tcp4",
70
+					Address: addr,
71
+				})
72
+			}
73
+		}
74
+	}
75
+
76
+	return addrSet
77
+})()

+ 0
- 1
run_profile.go Näytä tiedosto

@@ -3,5 +3,4 @@
3 3
 package main
4 4
 
5 5
 func runProfile() {
6
-
7 6
 }

Loading…
Peruuta
Tallenna