Merge remote-tracking branch 'origin/stable' into v2

Merge remote-tracking branch 'origin/master' into stable
Merge pull request #368 from 9seconds/flake-tests
2026-08-31 21:34:02 +03:00 · 2026-03-16 23:56:10 +01:00 · 2026-03-16 23:55:56 +01:00 · 2026-03-16 23:55:01 +01:00 · 2026-03-16 23:44:06 +01:00 · 2026-03-16 23:38:43 +01:00
3 changed files with 25 additions and 2 deletions
@@ -20,7 +20,7 @@ func (t *Telegram) GetAddresses(dc int) []Addr {
 	case preferIPOnlyIPv4:
 		return t.view.getV4(dc)
 	case preferIPOnlyIPv6:
-		return t.view.getV4(dc)
+		return t.view.getV6(dc)
 	case preferIPPreferIPv4:
 		return append(t.view.getV4(dc), t.view.getV6(dc)...)
 	}
@@ -9,6 +9,7 @@ import (
 	"io"
 	rnd "math/rand/v2"

+	"github.com/9seconds/mtg/v2/mtglib/internal/doppel"
 	"github.com/9seconds/mtg/v2/mtglib/internal/tls"
 	"golang.org/x/crypto/curve25519"
 )
@@ -125,7 +126,14 @@ func generateChangeCipherValue(buf *bytes.Buffer) {
 }

 func generateNoise(buf *bytes.Buffer) {
-	data := make([]byte, int64(1024+rnd.IntN(3092)))
+	data := make(
+		[]byte,
+		int64(
+			doppel.TLSRecordSizeStart+rnd.IntN(
+				doppel.TLSRecordSizeAccel-doppel.TLSRecordSizeStart,
+			),
+		),
+	)

 	if _, err := rand.Read(data[:]); err != nil {
 		panic(err)
@@ -3,6 +3,7 @@ package network
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"net/url"

 	"github.com/9seconds/mtg/v2/essentials"
@@ -15,6 +16,10 @@ type proxyNetwork struct {
 	client proxy.ContextDialer
 }

+func (p proxyNetwork) Dial(network, address string) (essentials.Conn, error) {
+	return p.DialContext(context.Background(), network, address)
+}
+
 func (p proxyNetwork) DialContext(ctx context.Context, network, address string) (essentials.Conn, error) {
 	conn, err := p.client.DialContext(ctx, network, address)
 	if err != nil {
@@ -24,6 +29,16 @@ func (p proxyNetwork) DialContext(ctx context.Context, network, address string)
 	return essentials.WrapNetConn(conn), nil
 }

+func (p proxyNetwork) MakeHTTPClient(
+	dialFunc func(context.Context, string, string) (essentials.Conn, error),
+) *http.Client {
+	if dialFunc == nil {
+		dialFunc = p.DialContext
+	}
+
+	return p.Network.MakeHTTPClient(dialFunc)
+}
+
 func NewProxyNetwork(base mtglib.Network, proxyURL *url.URL) (*proxyNetwork, error) {
 	socks, err := proxy.FromURL(proxyURL, base.NativeDialer())
 	if err != nil {
Author	SHA1	Message	Date
9seconds	dc81f7981c	Merge remote-tracking branch 'origin/stable' into v2	2026-03-16 23:56:10 +01:00
9seconds	9d5fd989e5	Merge remote-tracking branch 'origin/master' into stable	2026-03-16 23:55:56 +01:00
Sergei ArkhipovandGitHub	81703233b0	Merge pull request #368 from 9seconds/flake-tests Fix flaky test	2026-03-16 23:55:01 +01:00
9seconds	eb7720b11e	Fix flaky test	2026-03-16 23:44:06 +01:00
Sergei ArkhipovandGitHub	df7ddc3d6a	Merge pull request #367 from saleacy/patch-1 fix: ensure network.Dial and MakeHTTPClient use socks5 proxy	2026-03-16 23:38:43 +01:00
saleacyandGitHub	3bc1e415f9	fix: ensure network.Dial and MakeHTTPClient use socks5 proxy The package `network/v2/proxy_network.go` does not wrap `network.Dial` and `network.MakeHTTPClient`, which causes them to bypass the SOCKS5 proxy and initiate TCP connections directly from the local machine.	2026-03-17 01:35:18 +08:00
Sergei ArkhipovandGitHub	306fa19ad6	Merge pull request #366 from Maks-2012/patch-1 Fix preferIPOnlyIPv6	2026-03-16 15:31:09 +01:00
Maks-2012andGitHub	079252d810	Fix preferIPOnlyIPv6	2026-03-16 16:10:38 +03:00