ipv6: replace errOpNoSupport with errNotImplemented
Change-Id: I1d5c364421a6ba30c43f88ef4f333c7ea02a3bd4
Reviewed-on: https://go-review.googlesource.com/c/net/+/167338
Run-TryBot: Mikio Hara <mikioh.public.networking@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Matt Layher <mdlayher@gmail.com>
diff --git a/ipv6/control_stub.go b/ipv6/control_stub.go
index a045f28..ca78a43 100644
--- a/ipv6/control_stub.go
+++ b/ipv6/control_stub.go
@@ -9,5 +9,5 @@
import "golang.org/x/net/internal/socket"
func setControlMessage(c *socket.Conn, opt *rawOpt, cf ControlFlags, on bool) error {
- return errOpNoSupport
+ return errNotImplemented
}
diff --git a/ipv6/dgramopt.go b/ipv6/dgramopt.go
index eea4fde..1f422e7 100644
--- a/ipv6/dgramopt.go
+++ b/ipv6/dgramopt.go
@@ -18,7 +18,7 @@
}
so, ok := sockOpts[ssoMulticastHopLimit]
if !ok {
- return 0, errOpNoSupport
+ return 0, errNotImplemented
}
return so.GetInt(c.Conn)
}
@@ -31,7 +31,7 @@
}
so, ok := sockOpts[ssoMulticastHopLimit]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
return so.SetInt(c.Conn, hoplim)
}
@@ -44,7 +44,7 @@
}
so, ok := sockOpts[ssoMulticastInterface]
if !ok {
- return nil, errOpNoSupport
+ return nil, errNotImplemented
}
return so.getMulticastInterface(c.Conn)
}
@@ -57,7 +57,7 @@
}
so, ok := sockOpts[ssoMulticastInterface]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
return so.setMulticastInterface(c.Conn, ifi)
}
@@ -70,7 +70,7 @@
}
so, ok := sockOpts[ssoMulticastLoopback]
if !ok {
- return false, errOpNoSupport
+ return false, errNotImplemented
}
on, err := so.GetInt(c.Conn)
if err != nil {
@@ -87,7 +87,7 @@
}
so, ok := sockOpts[ssoMulticastLoopback]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
return so.SetInt(c.Conn, boolint(on))
}
@@ -107,7 +107,7 @@
}
so, ok := sockOpts[ssoJoinGroup]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
grp := netAddrToIP16(group)
if grp == nil {
@@ -125,7 +125,7 @@
}
so, ok := sockOpts[ssoLeaveGroup]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
grp := netAddrToIP16(group)
if grp == nil {
@@ -146,7 +146,7 @@
}
so, ok := sockOpts[ssoJoinSourceGroup]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
grp := netAddrToIP16(group)
if grp == nil {
@@ -167,7 +167,7 @@
}
so, ok := sockOpts[ssoLeaveSourceGroup]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
grp := netAddrToIP16(group)
if grp == nil {
@@ -189,7 +189,7 @@
}
so, ok := sockOpts[ssoBlockSourceGroup]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
grp := netAddrToIP16(group)
if grp == nil {
@@ -210,7 +210,7 @@
}
so, ok := sockOpts[ssoUnblockSourceGroup]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
grp := netAddrToIP16(group)
if grp == nil {
@@ -233,7 +233,7 @@
}
so, ok := sockOpts[ssoChecksum]
if !ok {
- return false, 0, errOpNoSupport
+ return false, 0, errNotImplemented
}
offset, err = so.GetInt(c.Conn)
if err != nil {
@@ -254,7 +254,7 @@
}
so, ok := sockOpts[ssoChecksum]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
if !on {
offset = -1
@@ -269,7 +269,7 @@
}
so, ok := sockOpts[ssoICMPFilter]
if !ok {
- return nil, errOpNoSupport
+ return nil, errNotImplemented
}
return so.getICMPFilter(c.Conn)
}
@@ -281,7 +281,7 @@
}
so, ok := sockOpts[ssoICMPFilter]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
return so.setICMPFilter(c.Conn, f)
}
@@ -295,7 +295,7 @@
}
so, ok := sockOpts[ssoAttachFilter]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
return so.setBPF(c.Conn, filter)
}
diff --git a/ipv6/endpoint.go b/ipv6/endpoint.go
index 9325756..f534a0b 100644
--- a/ipv6/endpoint.go
+++ b/ipv6/endpoint.go
@@ -37,7 +37,7 @@
}
so, ok := sockOpts[ssoPathMTU]
if !ok {
- return 0, errOpNoSupport
+ return 0, errNotImplemented
}
_, mtu, err := so.getMTUInfo(c.Conn)
if err != nil {
diff --git a/ipv6/genericopt.go b/ipv6/genericopt.go
index 1a18f75..0326aed 100644
--- a/ipv6/genericopt.go
+++ b/ipv6/genericopt.go
@@ -12,7 +12,7 @@
}
so, ok := sockOpts[ssoTrafficClass]
if !ok {
- return 0, errOpNoSupport
+ return 0, errNotImplemented
}
return so.GetInt(c.Conn)
}
@@ -25,7 +25,7 @@
}
so, ok := sockOpts[ssoTrafficClass]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
return so.SetInt(c.Conn, tclass)
}
@@ -37,7 +37,7 @@
}
so, ok := sockOpts[ssoHopLimit]
if !ok {
- return 0, errOpNoSupport
+ return 0, errNotImplemented
}
return so.GetInt(c.Conn)
}
@@ -50,7 +50,7 @@
}
so, ok := sockOpts[ssoHopLimit]
if !ok {
- return errOpNoSupport
+ return errNotImplemented
}
return so.SetInt(c.Conn, hoplim)
}
diff --git a/ipv6/helper.go b/ipv6/helper.go
index 44b5866..f767b1f 100644
--- a/ipv6/helper.go
+++ b/ipv6/helper.go
@@ -15,7 +15,6 @@
errMissingAddress = errors.New("missing address")
errHeaderTooShort = errors.New("header too short")
errInvalidConnType = errors.New("invalid conn type")
- errOpNoSupport = errors.New("operation not supported")
errNoSuchInterface = errors.New("no such interface")
errNotImplemented = errors.New("not implemented on " + runtime.GOOS + "/" + runtime.GOARCH)
)
diff --git a/ipv6/sockopt_posix.go b/ipv6/sockopt_posix.go
index 0eac86e..409fdbf 100644
--- a/ipv6/sockopt_posix.go
+++ b/ipv6/sockopt_posix.go
@@ -37,7 +37,7 @@
return nil, err
}
if n != sizeofICMPv6Filter {
- return nil, errOpNoSupport
+ return nil, errNotImplemented
}
return (*ICMPFilter)(unsafe.Pointer(&b[0])), nil
}
@@ -54,7 +54,7 @@
return nil, 0, err
}
if n != sizeofIPv6Mtuinfo {
- return nil, 0, errOpNoSupport
+ return nil, 0, errNotImplemented
}
mi := (*ipv6Mtuinfo)(unsafe.Pointer(&b[0]))
if mi.Addr.Scope_id == 0 {
@@ -74,7 +74,7 @@
case ssoTypeGroupReq:
return so.setGroupReq(c, ifi, grp)
default:
- return errOpNoSupport
+ return errNotImplemented
}
}
diff --git a/ipv6/sockopt_stub.go b/ipv6/sockopt_stub.go
index 1f4a273..d08e1bd 100644
--- a/ipv6/sockopt_stub.go
+++ b/ipv6/sockopt_stub.go
@@ -14,33 +14,33 @@
)
func (so *sockOpt) getMulticastInterface(c *socket.Conn) (*net.Interface, error) {
- return nil, errOpNoSupport
+ return nil, errNotImplemented
}
func (so *sockOpt) setMulticastInterface(c *socket.Conn, ifi *net.Interface) error {
- return errOpNoSupport
+ return errNotImplemented
}
func (so *sockOpt) getICMPFilter(c *socket.Conn) (*ICMPFilter, error) {
- return nil, errOpNoSupport
+ return nil, errNotImplemented
}
func (so *sockOpt) setICMPFilter(c *socket.Conn, f *ICMPFilter) error {
- return errOpNoSupport
+ return errNotImplemented
}
func (so *sockOpt) getMTUInfo(c *socket.Conn) (*net.Interface, int, error) {
- return nil, 0, errOpNoSupport
+ return nil, 0, errNotImplemented
}
func (so *sockOpt) setGroup(c *socket.Conn, ifi *net.Interface, grp net.IP) error {
- return errOpNoSupport
+ return errNotImplemented
}
func (so *sockOpt) setSourceGroup(c *socket.Conn, ifi *net.Interface, grp, src net.IP) error {
- return errOpNoSupport
+ return errNotImplemented
}
func (so *sockOpt) setBPF(c *socket.Conn, f []bpf.RawInstruction) error {
- return errOpNoSupport
+ return errNotImplemented
}
diff --git a/ipv6/sys_asmreq_stub.go b/ipv6/sys_asmreq_stub.go
index eece961..9e77c85 100644
--- a/ipv6/sys_asmreq_stub.go
+++ b/ipv6/sys_asmreq_stub.go
@@ -13,5 +13,5 @@
)
func (so *sockOpt) setIPMreq(c *socket.Conn, ifi *net.Interface, grp net.IP) error {
- return errOpNoSupport
+ return errNotImplemented
}
diff --git a/ipv6/sys_bpf_stub.go b/ipv6/sys_bpf_stub.go
index 676bea5..eb9f831 100644
--- a/ipv6/sys_bpf_stub.go
+++ b/ipv6/sys_bpf_stub.go
@@ -12,5 +12,5 @@
)
func (so *sockOpt) setAttachFilter(c *socket.Conn, f []bpf.RawInstruction) error {
- return errOpNoSupport
+ return errNotImplemented
}
diff --git a/ipv6/sys_ssmreq_stub.go b/ipv6/sys_ssmreq_stub.go
index 581ee49..82e07c3 100644
--- a/ipv6/sys_ssmreq_stub.go
+++ b/ipv6/sys_ssmreq_stub.go
@@ -13,9 +13,9 @@
)
func (so *sockOpt) setGroupReq(c *socket.Conn, ifi *net.Interface, grp net.IP) error {
- return errOpNoSupport
+ return errNotImplemented
}
func (so *sockOpt) setGroupSourceReq(c *socket.Conn, ifi *net.Interface, grp, src net.IP) error {
- return errOpNoSupport
+ return errNotImplemented
}
