1 files changed, 16 insertions, 18 deletions

diff --git a/vendor/golang.org/x/net/ipv6/endpoint.go b/vendor/golang.org/x/net/ipv6/endpoint.go
index ce0b0ce27..0624c1740 100644
--- a/vendor/golang.org/x/net/ipv6/endpoint.go
+++ b/vendor/golang.org/x/net/ipv6/endpoint.go
@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"time"
 
-	"golang.org/x/net/internal/netreflect"
+	"golang.org/x/net/internal/socket"
 )
 
 // BUG(mikio): On Windows, the JoinSourceSpecificGroup,
@@ -25,7 +25,7 @@ type Conn struct {
 }
 
 type genericOpt struct {
-	net.Conn
+	*socket.Conn
 }
 
 func (c *genericOpt) ok() bool { return c != nil && c.Conn != nil }
@@ -33,14 +33,14 @@ func (c *genericOpt) ok() bool { return c != nil && c.Conn != nil }
 // PathMTU returns a path MTU value for the destination associated
 // with the endpoint.
 func (c *Conn) PathMTU() (int, error) {
-	if !c.genericOpt.ok() {
+	if !c.ok() {
 		return 0, syscall.EINVAL
 	}
-	s, err := netreflect.SocketOf(c.genericOpt.Conn)
-	if err != nil {
-		return 0, err
+	so, ok := sockOpts[ssoPathMTU]
+	if !ok {
+		return 0, errOpNoSupport
 	}
-	_, mtu, err := getMTUInfo(s, &sockOpts[ssoPathMTU])
+	_, mtu, err := so.getMTUInfo(c.Conn)
 	if err != nil {
 		return 0, err
 	}
@@ -49,8 +49,9 @@ func (c *Conn) PathMTU() (int, error) {
 
 // NewConn returns a new Conn.
 func NewConn(c net.Conn) *Conn {
+	cc, _ := socket.NewConn(c)
 	return &Conn{
-		genericOpt: genericOpt{Conn: c},
+		genericOpt: genericOpt{Conn: cc},
 	}
 }
 
@@ -66,10 +67,10 @@ type PacketConn struct {
 }
 
 type dgramOpt struct {
-	net.PacketConn
+	*socket.Conn
 }
 
-func (c *dgramOpt) ok() bool { return c != nil && c.PacketConn != nil }
+func (c *dgramOpt) ok() bool { return c != nil && c.Conn != nil }
 
 // SetControlMessage allows to receive the per packet basis IP-level
 // socket options.
@@ -77,11 +78,7 @@ func (c *PacketConn) SetControlMessage(cf ControlFlags, on bool) error {
 	if !c.payloadHandler.ok() {
 		return syscall.EINVAL
 	}
-	s, err := netreflect.PacketSocketOf(c.dgramOpt.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setControlMessage(s, &c.payloadHandler.rawOpt, cf, on)
+	return setControlMessage(c.dgramOpt.Conn, &c.payloadHandler.rawOpt, cf, on)
 }
 
 // SetDeadline sets the read and write deadlines associated with the
@@ -122,9 +119,10 @@ func (c *PacketConn) Close() error {
 // NewPacketConn returns a new PacketConn using c as its underlying
 // transport.
 func NewPacketConn(c net.PacketConn) *PacketConn {
+	cc, _ := socket.NewConn(c.(net.Conn))
 	return &PacketConn{
-		genericOpt:     genericOpt{Conn: c.(net.Conn)},
-		dgramOpt:       dgramOpt{PacketConn: c},
-		payloadHandler: payloadHandler{PacketConn: c},
+		genericOpt:     genericOpt{Conn: cc},
+		dgramOpt:       dgramOpt{Conn: cc},
+		payloadHandler: payloadHandler{PacketConn: c, Conn: cc},
 	}
 }