yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-11-04 03:05:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge conflict in tcp.go from d027a9ba75

Browse source
This commit is contained in:
Neil Alexander 2018-10-04 12:26:08 +01:00
parent 69cd736112
commit 8eed15b813
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/yggdrasil/tcp.go
View file

@ -161,8 +161,10 @@ func (iface *tcpInterface) call(saddr string, socksaddr *string, sintf string) {
dialer := net.Dialer{}
if sintf != "" {
ief, err := net.InterfaceByName(sintf)
if err == nil {
if ief.Flags&net.FlagUp == 0 {
if err != nil {
return
} else {
if ief.Flags & net.FlagUp == 0 {
return
}
addrs, err := ief.Addrs()