From: Ian Lance Taylor <iant@golang.org>
Date: Wed, 3 Jan 2018 18:09:35 +0000 (-0800)
Subject: net: report connect error as coming from "connect"
X-Git-Tag: go1.10beta2~67
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=36454187dbd9d543c4ff2f4c9c41e513fcae54ab;p=gostls13.git

net: report connect error as coming from "connect"

We retrieve an error using getsockopt with SO_ERROR. We were reporting
the error as coming from "getsockopt", but really it is coming from
"connect". It is not getsockopt that failed.

Fixes #19302

Change-Id: I510ab76e4b04c70cd9dfdfc46d9a410bf653d017
Reviewed-on: https://go-review.googlesource.com/85997
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/net/fd_unix.go b/src/net/fd_unix.go
index 87486578af..dd3c1ed882 100644
--- a/src/net/fd_unix.go
+++ b/src/net/fd_unix.go
@@ -173,7 +173,7 @@ func (fd *netFD) connect(ctx context.Context, la, ra syscall.Sockaddr) (rsa sysc
 				return rsa, nil
 			}
 		default:
-			return nil, os.NewSyscallError("getsockopt", err)
+			return nil, os.NewSyscallError("connect", err)
 		}
 		runtime.KeepAlive(fd)
 	}