From 063b31e6ca6659203978d6b50e782e56ad925b6d Mon Sep 17 00:00:00 2001 From: Vincent Yiu Date: Sun, 13 Mar 2016 18:30:40 +0000 Subject: [PATCH 1/2] Update utils.py It wasn't redirecting to the specified location. --- utils.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/utils.py b/utils.py index b88c0ee..7b4fdc7 100644 --- a/utils.py +++ b/utils.py @@ -105,12 +105,15 @@ def FindLocalIP(Iface, OURIP): if IsOsX(): return OURIP else: - s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - s.setsockopt(socket.SOL_SOCKET, 25, Iface+'\0') - s.connect(("127.0.0.1",9))#RFC 863 - ret = s.getsockname()[0] - s.close() - return ret + if OURIP == None: + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + s.setsockopt(socket.SOL_SOCKET, 25, Iface+'\0') + s.connect(("127.0.0.1",9))#RFC 863 + ret = s.getsockname()[0] + s.close() + return ret + else: + return OURIP except socket.error: print color("[!] Error: %s: Interface not found" % Iface, 1) From 0b4f961b79567363f3bbd9147b5952e158e9f2ad Mon Sep 17 00:00:00 2001 From: Vincent Yiu Date: Fri, 13 May 2016 13:26:48 +0100 Subject: [PATCH 2/2] Update utils.py Use elif --- utils.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/utils.py b/utils.py index 7b4fdc7..840cf34 100644 --- a/utils.py +++ b/utils.py @@ -101,19 +101,17 @@ def FindLocalIP(Iface, OURIP): return '0.0.0.0' try: - - if IsOsX(): - return OURIP - else: - if OURIP == None: - s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - s.setsockopt(socket.SOL_SOCKET, 25, Iface+'\0') - s.connect(("127.0.0.1",9))#RFC 863 - ret = s.getsockname()[0] - s.close() - return ret - else: - return OURIP + if IsOsX(): + return OURIP + elif OURIP == None: + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + s.setsockopt(socket.SOL_SOCKET, 25, Iface+'\0') + s.connect(("127.0.0.1",9))#RFC 863 + ret = s.getsockname()[0] + s.close() + return ret + else: + return OURIP except socket.error: print color("[!] Error: %s: Interface not found" % Iface, 1)