Backups/mihomo
1
0
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2025-09-19 12:06:01 +08:00
Code Issues Wiki Activity

fix: golang1.19 can't compile

Browse Source
This commit is contained in:
wwqgtxx
2023-02-26 22:20:25 +08:00
parent d36f9c2ac8
commit c8c078e78a
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
component/dialer/dialer.go
View File

@ -2,7 +2,6 @@ package dialer
import (
"context"
"errors"
"fmt"
"net"
"net/netip"
@ -19,7 +18,6 @@ var (
actualSingleStackDialContext = serialSingleStackDialContext
actualDualStackDialContext = serialDualStackDialContext
tcpConcurrent = false
ErrorInvalidedNetworkStack = errors.New("invalided network stack")
fallbackTimeout = 300 * time.Millisecond
)
@ -227,7 +225,7 @@ func dualStackDialContext(
func parallelDialContext(ctx context.Context, network string, ips []netip.Addr, port string, opt *option) (net.Conn, error) {
if len(ips) == 0 {
return nil, errors.New("no ip address")
return nil, ErrorNoIpAddress
}
results := make(chan dialResult)
returned := make(chan struct{})
@ -272,7 +270,7 @@ func parallelDialContext(ctx context.Context, network string, ips []netip.Addr,
func serialDialContext(ctx context.Context, network string, ips []netip.Addr, port string, opt *option) (net.Conn, error) {
if len(ips) == 0 {
return nil, errors.New("no ip address")
return nil, ErrorNoIpAddress
}
var (
conn net.Conn
@ -286,7 +284,7 @@ func serialDialContext(ctx context.Context, network string, ips []netip.Addr, po
errs = append(errs, err)
}
}
return nil, errors.Join(errs...)
return nil, errorsJoin(errs...)
}
type dialResult struct {