mirror of
https://github.com/cwinfo/yggdrasil-go.git
synced 2024-11-25 21:51:38 +00:00
Fix merge conflict in tcp.go from d027a9ba75
This commit is contained in:
parent
69cd736112
commit
8eed15b813
@ -161,8 +161,10 @@ func (iface *tcpInterface) call(saddr string, socksaddr *string, sintf string) {
|
|||||||
dialer := net.Dialer{}
|
dialer := net.Dialer{}
|
||||||
if sintf != "" {
|
if sintf != "" {
|
||||||
ief, err := net.InterfaceByName(sintf)
|
ief, err := net.InterfaceByName(sintf)
|
||||||
if err == nil {
|
if err != nil {
|
||||||
if ief.Flags&net.FlagUp == 0 {
|
return
|
||||||
|
} else {
|
||||||
|
if ief.Flags & net.FlagUp == 0 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
addrs, err := ief.Addrs()
|
addrs, err := ief.Addrs()
|
||||||
|
Loading…
Reference in New Issue
Block a user