From d8ec87036ead4ac2dff7c935c5ec3fd021dfa9d8 Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Tue, 20 Feb 2018 15:35:05 +0100
Subject: [PATCH] misc: small fix or general refactoring i did not bother
 commenting

---
 network/net.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/network/net.go b/network/net.go
index c2717704..5f72b9c7 100644
--- a/network/net.go
+++ b/network/net.go
@@ -55,6 +55,8 @@ func FindInterface(name string) (*Endpoint, error) {
 		}
 		nAddrs := len(addrs)
 
+		// fmt.Printf("iface=%v\n", iface)
+
 		/*
 		 * If no interface has been specified, return the first active
 		 * one with at least an ip address, otherwise just the match
@@ -62,7 +64,7 @@ func FindInterface(name string) (*Endpoint, error) {
 		 * if passed explicitly.
 		 */
 		doCheck := false
-		if name == mac {
+		if name != "" && name == mac {
 			doCheck = true
 		} else if name == "" && ifName != "lo" && ifName != "lo0" && nAddrs > 0 {
 			doCheck = true
@@ -73,7 +75,10 @@ func FindInterface(name string) (*Endpoint, error) {
 		// Also search by ip if needed.
 		hasIPv4 := false
 		for _, a := range addrs {
-			hasIPv4 = IPv4Validator.MatchString(a.String())
+			if IPv4Validator.MatchString(a.String()) {
+				hasIPv4 = true
+			}
+
 			if name != "" && (a.String() == name || strings.HasPrefix(a.String(), name)) {
 				doCheck = true
 			}