From adf4ab1a35682d5582510bb5be4974665f0918df Mon Sep 17 00:00:00 2001 From: 9seconds Date: Wed, 17 Mar 2021 22:03:36 +0300 Subject: [PATCH] Revert "Add new TCPBufferSize parameter to network" This reverts commit 57cb1b5aa0199301ec9b40330c088b15003c9fa9. --- mtglib/init.go | 1 - network/default.go | 4 ---- network/default_test.go | 4 ---- network/init.go | 1 - network/init_internal_test.go | 4 ---- network/init_test.go | 4 ---- network/load_balanced_socks5.go | 10 ++-------- network/load_balanced_socks5_test.go | 1 - network/network.go | 4 ---- network/socks5.go | 20 +------------------- testlib/mtglib_network_mock.go | 4 ---- 11 files changed, 3 insertions(+), 54 deletions(-) diff --git a/mtglib/init.go b/mtglib/init.go index 5f68661..e663c62 100644 --- a/mtglib/init.go +++ b/mtglib/init.go @@ -27,7 +27,6 @@ type Network interface { DialContext(ctx context.Context, network, address string) (net.Conn, error) MakeHTTPClient(func(ctx context.Context, network, address string) (net.Conn, error)) *http.Client IdleTimeout() time.Duration - TCPBufferSize() int } type AntiReplayCache interface { diff --git a/network/default.go b/network/default.go index db104f0..72b3da5 100644 --- a/network/default.go +++ b/network/default.go @@ -60,10 +60,6 @@ func (d *defaultDialer) DialContext(ctx context.Context, network, address string return tcpConn, nil } -func (d *defaultDialer) TCPBufferSize() int { - return d.bufferSize -} - func NewDefaultDialer(timeout time.Duration, bufferSize int) (Dialer, error) { switch { case timeout < 0: diff --git a/network/default_test.go b/network/default_test.go index 4136770..a6b24c7 100644 --- a/network/default_test.go +++ b/network/default_test.go @@ -71,10 +71,6 @@ func (suite *DefaultDialerTestSuite) TestHTTPRequest() { suite.Equal(http.StatusOK, resp.StatusCode) } -func (suite *DefaultDialerTestSuite) TestTCPBufferSize() { - suite.Equal(network.DefaultBufferSize, suite.d.TCPBufferSize()) -} - func TestDefaultDialer(t *testing.T) { t.Parallel() suite.Run(t, &DefaultDialerTestSuite{}) diff --git a/network/init.go b/network/init.go index bdb4b26..3bab936 100644 --- a/network/init.go +++ b/network/init.go @@ -29,5 +29,4 @@ var ( type Dialer interface { Dial(network, address string) (net.Conn, error) DialContext(ctx context.Context, network, address string) (net.Conn, error) - TCPBufferSize() int } diff --git a/network/init_internal_test.go b/network/init_internal_test.go index b908a01..9335818 100644 --- a/network/init_internal_test.go +++ b/network/init_internal_test.go @@ -22,7 +22,3 @@ func (d *DialerMock) DialContext(ctx context.Context, network, address string) ( return args.Get(0).(net.Conn), args.Error(1) } - -func (d *DialerMock) TCPBufferSize() int { - return d.Called().Int(0) -} diff --git a/network/init_test.go b/network/init_test.go index b75ff11..f42d1c3 100644 --- a/network/init_test.go +++ b/network/init_test.go @@ -30,10 +30,6 @@ func (d *DialerMock) DialContext(ctx context.Context, network, address string) ( return args.Get(0).(net.Conn), args.Error(1) } -func (d *DialerMock) TCPBufferSize() int { - return d.Called().Int(0) -} - type HTTPServerTestSuite struct { httpServer *httptest.Server } diff --git a/network/load_balanced_socks5.go b/network/load_balanced_socks5.go index 41331a5..2a60d69 100644 --- a/network/load_balanced_socks5.go +++ b/network/load_balanced_socks5.go @@ -9,18 +9,13 @@ import ( ) type loadBalancedSocks5Dialer struct { - dialers []Dialer - bufferSize int + dialers []Dialer } func (l loadBalancedSocks5Dialer) Dial(network, address string) (net.Conn, error) { return l.DialContext(context.Background(), network, address) } -func (l loadBalancedSocks5Dialer) TCPBufferSize() int { - return l.bufferSize -} - func (l loadBalancedSocks5Dialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) { length := len(l.dialers) start := rand.Intn(length) @@ -50,7 +45,6 @@ func NewLoadBalancedSocks5Dialer(baseDialer Dialer, proxyURLs []*url.URL) (Diale } return loadBalancedSocks5Dialer{ - dialers: dialers, - bufferSize: baseDialer.TCPBufferSize(), + dialers: dialers, }, nil } diff --git a/network/load_balanced_socks5_test.go b/network/load_balanced_socks5_test.go index 25ca3b3..b6983c8 100644 --- a/network/load_balanced_socks5_test.go +++ b/network/load_balanced_socks5_test.go @@ -57,7 +57,6 @@ func (suite *LoadBalancedSocks5TestSuite) TestCannotDial() { baseDialer.On("DialContext", mock.Anything, "tcp", "127.0.0.2:1080"). Times(network.ProxyDialerOpenThreshold). Return(&net.TCPConn{}, io.EOF) - baseDialer.On("TCPBufferSize").Return(network.DefaultBufferSize) lbDialer, err := network.NewLoadBalancedSocks5Dialer(baseDialer, []*url.URL{ {Scheme: "socks5", User: url.UserPassword("user", "password"), Host: "127.0.0.1:1080"}, diff --git a/network/network.go b/network/network.go index f2cb044..585ff3c 100644 --- a/network/network.go +++ b/network/network.go @@ -75,10 +75,6 @@ func (n *network) IdleTimeout() time.Duration { return n.idleTimeout } -func (n *network) TCPBufferSize() int { - return n.dialer.TCPBufferSize() -} - func (n *network) dnsResolve(protocol, address string) ([]string, error) { if net.ParseIP(address) != nil { return []string{address}, nil diff --git a/network/socks5.go b/network/socks5.go index 66c1f23..91c9c61 100644 --- a/network/socks5.go +++ b/network/socks5.go @@ -2,34 +2,16 @@ package network import ( "fmt" - "net" "net/url" "golang.org/x/net/proxy" ) -type socks5Dialer struct { - proxy.ContextDialer - - bufferSize int -} - -func (s socks5Dialer) Dial(protocol, address string) (net.Conn, error) { - return s.ContextDialer.(proxy.Dialer).Dial(protocol, address) -} - -func (s socks5Dialer) TCPBufferSize() int { - return s.bufferSize -} - func NewSocks5Dialer(baseDialer Dialer, proxyURL *url.URL) (Dialer, error) { rv, err := proxy.FromURL(proxyURL, baseDialer) if err != nil { return nil, fmt.Errorf("cannot initialize socks5 proxy dialer: %w", err) } - return socks5Dialer{ - ContextDialer: rv.(proxy.ContextDialer), - bufferSize: baseDialer.TCPBufferSize(), - }, nil + return rv.(Dialer), nil } diff --git a/testlib/mtglib_network_mock.go b/testlib/mtglib_network_mock.go index 3e89fdd..23fa8ba 100644 --- a/testlib/mtglib_network_mock.go +++ b/testlib/mtglib_network_mock.go @@ -33,7 +33,3 @@ func (m *MtglibNetworkMock) MakeHTTPClient(dialFunc func(ctx context.Context, func (m *MtglibNetworkMock) IdleTimeout() time.Duration { return m.Called().Get(0).(time.Duration) } - -func (m *MtglibNetworkMock) TCPBufferSize() int { - return m.Called().Int(0) -}