From 5cdb862f15fc4d0772ace2ca3fd0271233012185 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 9 Feb 2021 19:46:57 +0100 Subject: conn: use errors.Is for unwrapping Signed-off-by: Jason A. Donenfeld --- conn/conn_default.go | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'conn') diff --git a/conn/conn_default.go b/conn/conn_default.go index 22248af..2360068 100644 --- a/conn/conn_default.go +++ b/conn/conn_default.go @@ -8,8 +8,8 @@ package conn import ( + "errors" "net" - "os" "syscall" ) @@ -84,18 +84,6 @@ func listenNet(network string, port int) (*net.UDPConn, int, error) { return conn, uaddr.Port, nil } -func extractErrno(err error) error { - opErr, ok := err.(*net.OpError) - if !ok { - return nil - } - syscallErr, ok := opErr.Err.(*os.SyscallError) - if !ok { - return nil - } - return syscallErr.Err -} - func createBind(uport uint16) (Bind, uint16, error) { var err error var bind nativeBind @@ -105,16 +93,16 @@ again: port := int(uport) bind.ipv4, port, err = listenNet("udp4", port) - if err != nil && extractErrno(err) != syscall.EAFNOSUPPORT { + if err != nil && !errors.Is(err, syscall.EAFNOSUPPORT) { return nil, 0, err } bind.ipv6, port, err = listenNet("udp6", port) - if uport == 0 && err != nil && extractErrno(err) == syscall.EADDRINUSE && tries < 100 { + if uport == 0 && err != nil && errors.Is(err, syscall.EADDRINUSE) && tries < 100 { tries++ goto again } - if err != nil && extractErrno(err) != syscall.EAFNOSUPPORT { + if err != nil && !errors.Is(err, syscall.EAFNOSUPPORT) { bind.ipv4.Close() bind.ipv4 = nil return nil, 0, err -- cgit v1.2.3-59-g8ed1b