From 8eed15b813e63d7384cdd1395169920aea00c7e8 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Thu, 4 Oct 2018 12:26:08 +0100
Subject: [PATCH] Fix merge conflict in tcp.go from
 d027a9ba75baa88207f9c4f2c337f59ded83e6e7

---
 src/yggdrasil/tcp.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/yggdrasil/tcp.go b/src/yggdrasil/tcp.go
index 9e96344..1942acd 100644
--- a/src/yggdrasil/tcp.go
+++ b/src/yggdrasil/tcp.go
@@ -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()