vendor: Update golang.org/x/net/...

This commit is contained in:
Jakob Borg
2016-09-13 21:47:00 +02:00
parent 6af09c61be
commit 897cca0a82
69 changed files with 1994 additions and 434 deletions

View File

@@ -6,7 +6,11 @@
package ipv6
import "syscall"
import (
"syscall"
"golang.org/x/net/internal/netreflect"
)
// TrafficClass returns the traffic class field value for outgoing
// packets.
@@ -14,11 +18,11 @@ func (c *genericOpt) TrafficClass() (int, error) {
if !c.ok() {
return 0, syscall.EINVAL
}
fd, err := c.sysfd()
s, err := netreflect.SocketOf(c.Conn)
if err != nil {
return 0, err
}
return getInt(fd, &sockOpts[ssoTrafficClass])
return getInt(s, &sockOpts[ssoTrafficClass])
}
// SetTrafficClass sets the traffic class field value for future
@@ -27,11 +31,11 @@ func (c *genericOpt) SetTrafficClass(tclass int) error {
if !c.ok() {
return syscall.EINVAL
}
fd, err := c.sysfd()
s, err := netreflect.SocketOf(c.Conn)
if err != nil {
return err
}
return setInt(fd, &sockOpts[ssoTrafficClass], tclass)
return setInt(s, &sockOpts[ssoTrafficClass], tclass)
}
// HopLimit returns the hop limit field value for outgoing packets.
@@ -39,11 +43,11 @@ func (c *genericOpt) HopLimit() (int, error) {
if !c.ok() {
return 0, syscall.EINVAL
}
fd, err := c.sysfd()
s, err := netreflect.SocketOf(c.Conn)
if err != nil {
return 0, err
}
return getInt(fd, &sockOpts[ssoHopLimit])
return getInt(s, &sockOpts[ssoHopLimit])
}
// SetHopLimit sets the hop limit field value for future outgoing
@@ -52,9 +56,9 @@ func (c *genericOpt) SetHopLimit(hoplim int) error {
if !c.ok() {
return syscall.EINVAL
}
fd, err := c.sysfd()
s, err := netreflect.SocketOf(c.Conn)
if err != nil {
return err
}
return setInt(fd, &sockOpts[ssoHopLimit], hoplim)
return setInt(s, &sockOpts[ssoHopLimit], hoplim)
}