github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Chore: Simplify some syscall error checks

Browse Source 
This just replaces some type casts to check whether a few dial errors are
a specific syscall with the stdlibs errors.As/errors.Is pals.

Signed-off-by: Danny Canter <danny@dcantah.dev>
This commit is contained in:
Danny Canter 2024-05-06 00:44:13 -07:00
parent a26c686ea2
commit f0363a7f6b
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/dialer/dialer_unix.go
View File

@ -19,9 +19,9 @@
package dialer
import (
"errors"
"fmt"
"net"
"os"
"strings"
"syscall"
"time"
@ -34,16 +34,7 @@ func DialAddress(address string) string {
}
func isNoent(err error) bool {
if err != nil {
if nerr, ok := err.(*net.OpError); ok {
if serr, ok := nerr.Err.(*os.SyscallError); ok {
if serr.Err == syscall.ENOENT {
return true
}
}
}
}
return false
return errors.Is(err, syscall.ENOENT)
}
func dialer(address string, timeout time.Duration) (net.Conn, error) {

23
pkg/shim/util_unix.go
View File

@ -22,6 +22,7 @@ import (
"bufio"
"context"
"crypto/sha256"
"errors"
"fmt"
"io"
"math"
@ -173,22 +174,14 @@ func RemoveSocket(address string) error {
// SocketEaddrinuse returns true if the provided error is caused by the
// EADDRINUSE error number
func SocketEaddrinuse(err error) bool {
netErr, ok := err.(*net.OpError)
if !ok {
return false
var netErr *net.OpError
if errors.As(err, &netErr) {
if netErr.Op != "listen" {
return false
}
return errors.Is(err, syscall.EADDRINUSE)
}
if netErr.Op != "listen" {
return false
}
syscallErr, ok := netErr.Err.(*os.SyscallError)
if !ok {
return false
}
errno, ok := syscallErr.Err.(syscall.Errno)
if !ok {
return false
}
return errno == syscall.EADDRINUSE
return false
}
// CanConnect returns true if the socket provided at the address