From 4e4ccdb00739508e19ecbeb4a428aac53760fab9 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Mon, 20 Apr 2020 14:30:28 +0700 Subject: [PATCH] fix qlogging of the remote address when dialing a new connection --- client.go | 2 +- client_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client.go b/client.go index aeda2b16c..ee46c454e 100644 --- a/client.go +++ b/client.go @@ -252,7 +252,7 @@ func newClient( func (c *client) dial(ctx context.Context) error { c.logger.Infof("Starting new connection to %s (%s -> %s), source connection ID %s, destination connection ID %s, version %s", c.tlsConf.ServerName, c.conn.LocalAddr(), c.conn.RemoteAddr(), c.srcConnID, c.destConnID, c.version) if c.qlogger != nil { - c.qlogger.StartedConnection(c.conn.LocalAddr(), c.conn.LocalAddr(), c.version, c.srcConnID, c.destConnID) + c.qlogger.StartedConnection(c.conn.LocalAddr(), c.conn.RemoteAddr(), c.version, c.srcConnID, c.destConnID) } c.mutex.Lock() diff --git a/client_test.go b/client_test.go index 0a9dc35f7..5ce40dc6c 100644 --- a/client_test.go +++ b/client_test.go @@ -243,7 +243,7 @@ var _ = Describe("Client", func() { sess.EXPECT().run() return sess } - qlogger.EXPECT().StartedConnection(gomock.Any(), gomock.Any(), protocol.VersionTLS, gomock.Any(), gomock.Any()) + qlogger.EXPECT().StartedConnection(packetConn.addr, addr, protocol.VersionTLS, gomock.Any(), gomock.Any()) _, err := Dial( packetConn, addr,