From 8098e9f976e8321b7a497f48ce94fcf9632752a5 Mon Sep 17 00:00:00 2001 From: ginuerzh Date: Fri, 19 Aug 2022 22:26:40 +0800 Subject: [PATCH] fix grpc dialer --- connector/http2/connector.go | 2 +- dialer/grpc/dialer.go | 2 +- listener/http2/conn.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/connector/http2/connector.go b/connector/http2/connector.go index eafb7d2..76dbff6 100644 --- a/connector/http2/connector.go +++ b/connector/http2/connector.go @@ -91,7 +91,7 @@ func (c *http2Connector) Connect(ctx context.Context, conn net.Conn, network, ad } client := v.GetMetadata().Get("client").(*http.Client) - resp, err := client.Do(req.WithContext(ctx)) + resp, err := client.Do(req) if err != nil { log.Error(err) conn.Close() diff --git a/dialer/grpc/dialer.go b/dialer/grpc/dialer.go index e4f7c2e..6200ef4 100644 --- a/dialer/grpc/dialer.go +++ b/dialer/grpc/dialer.go @@ -99,7 +99,7 @@ func (d *grpcDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialO d.clients[addr] = client } - cli, err := client.TunnelX(ctx, d.md.path) + cli, err := client.TunnelX(context.Background(), d.md.path) if err != nil { return nil, err } diff --git a/listener/http2/conn.go b/listener/http2/conn.go index 4e090e0..775ec9b 100644 --- a/listener/http2/conn.go +++ b/listener/http2/conn.go @@ -37,7 +37,7 @@ func (c *conn) Close() error { } func (c *conn) LocalAddr() net.Addr { - return c.raddr + return c.laddr } func (c *conn) RemoteAddr() net.Addr {