From 085c8b4e9124d9af91f0ab3a1833e2c10ac65176 Mon Sep 17 00:00:00 2001 From: IwraStudios Date: Sat, 11 Feb 2017 12:05:08 +0100 Subject: [PATCH 1/3] Update Endpoint.java --- cSploit/src/main/java/org/csploit/android/net/Endpoint.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cSploit/src/main/java/org/csploit/android/net/Endpoint.java b/cSploit/src/main/java/org/csploit/android/net/Endpoint.java index c0dfebb9e9..7ac25d8301 100644 --- a/cSploit/src/main/java/org/csploit/android/net/Endpoint.java +++ b/cSploit/src/main/java/org/csploit/android/net/Endpoint.java @@ -58,8 +58,14 @@ public Endpoint(String address){ } public Endpoint(InetAddress address, byte[] hardware){ + try{ mAddress = address; mHardware = Arrays.copyOf(hardware, hardware.length); + } + catch(Exeption e){ + System.errorLogging(e); + mAddress = null; + } } public Endpoint(String address, String hardware){ From f24da270f3e3c4b994784e32e1e7b7cd786ee7a3 Mon Sep 17 00:00:00 2001 From: IwraStudios Date: Sat, 11 Feb 2017 12:07:58 +0100 Subject: [PATCH 2/3] typo --- cSploit/src/main/java/org/csploit/android/net/Endpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cSploit/src/main/java/org/csploit/android/net/Endpoint.java b/cSploit/src/main/java/org/csploit/android/net/Endpoint.java index 7ac25d8301..f665e71630 100644 --- a/cSploit/src/main/java/org/csploit/android/net/Endpoint.java +++ b/cSploit/src/main/java/org/csploit/android/net/Endpoint.java @@ -62,7 +62,7 @@ public Endpoint(InetAddress address, byte[] hardware){ mAddress = address; mHardware = Arrays.copyOf(hardware, hardware.length); } - catch(Exeption e){ + catch(Exception e){ System.errorLogging(e); mAddress = null; } From 6162c3c5935c1d46f2f683d85fc9d0ead56e287f Mon Sep 17 00:00:00 2001 From: tux-mind Date: Sat, 11 Feb 2017 12:37:25 +0100 Subject: [PATCH 3/3] [#831] allow creation of Endpoint with null HW address fixes #831 --- .../java/org/csploit/android/net/Endpoint.java | 16 +++++----------- .../java/org/csploit/android/net/Network.java | 12 ++++-------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/cSploit/src/main/java/org/csploit/android/net/Endpoint.java b/cSploit/src/main/java/org/csploit/android/net/Endpoint.java index f665e71630..2f52d5d100 100644 --- a/cSploit/src/main/java/org/csploit/android/net/Endpoint.java +++ b/cSploit/src/main/java/org/csploit/android/net/Endpoint.java @@ -19,6 +19,9 @@ package org.csploit.android.net; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import org.csploit.android.core.System; +import org.csploit.android.helpers.NetworkHelper; import java.io.BufferedReader; import java.math.BigInteger; @@ -26,9 +29,6 @@ import java.net.UnknownHostException; import java.util.Arrays; -import org.csploit.android.core.System; -import org.csploit.android.helpers.NetworkHelper; - public class Endpoint implements Comparable { private InetAddress mAddress = null; @@ -57,15 +57,9 @@ public Endpoint(String address){ this(address, null); } - public Endpoint(InetAddress address, byte[] hardware){ - try{ + public Endpoint(InetAddress address, @Nullable byte[] hardware){ mAddress = address; - mHardware = Arrays.copyOf(hardware, hardware.length); - } - catch(Exception e){ - System.errorLogging(e); - mAddress = null; - } + mHardware = hardware != null ? Arrays.copyOf(hardware, hardware.length) : null; } public Endpoint(String address, String hardware){ diff --git a/cSploit/src/main/java/org/csploit/android/net/Network.java b/cSploit/src/main/java/org/csploit/android/net/Network.java index a560cae834..b4ad47e191 100644 --- a/cSploit/src/main/java/org/csploit/android/net/Network.java +++ b/cSploit/src/main/java/org/csploit/android/net/Network.java @@ -25,20 +25,15 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.util.Patterns; - import org.apache.commons.net.util.SubnetUtils; import org.csploit.android.core.Logger; import org.csploit.android.core.System; import org.csploit.android.helpers.NetworkHelper; import java.lang.reflect.Method; -import java.net.InetAddress; -import java.net.InterfaceAddress; -import java.net.NetworkInterface; -import java.net.NoRouteToHostException; -import java.net.SocketException; -import java.net.UnknownHostException; +import java.net.*; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; @@ -339,9 +334,10 @@ public byte[] getGatewayHardware() { return Endpoint.parseMacAddress(mWifiInfo.getBSSID()); } + @Nullable public byte[] getLocalHardware() { try { - return mInterface.getHardwareAddress(); + return mInterface.getHardwareAddress(); //FIXME: #831 } catch (SocketException e) { System.errorLogging(e); }