CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-06-16 21:10:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve local IP address detection

Browse Source 
The IP address of the WiFi interface is tried first. If inactive, then all the network interfaces
are iterated.
This commit is contained in:
emanuele-f 2020-01-11 15:45:25 +01:00
parent b1da40d478
commit cb3b34d697
4 changed files with 100 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -37,8 +37,8 @@
</intent-filter>
</service>
</application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
</manifest>

12
app/src/main/java/com/emanuelef/remote_capture/CaptureService.java
View File

@ -54,6 +54,14 @@ public class CaptureService extends VpnService implements Runnable {
private static CaptureService INSTANCE;
private HTTPServer mHttpServer;
/* The IP address of the virtual network interface */
public static final String VPN_IP_ADDRESS = "10.215.173.1";
/* The DNS server IP address to use to internally analyze the DNS requests.
* It must be in the same subnet of the VPN network interface.
* After the analysis, requests will be routed to the primary DNS server. */
public static final String VPN_VIRTUAL_DNS_SERVER = "10.215.173.2";
public static final String ACTION_TRAFFIC_STATS_UPDATE = "traffic_stats_update";
public static final String ACTION_CONNECTIONS_DUMP = "connections_dump";
public static final String TRAFFIC_STATS_UPDATE_SENT_BYTES = "sent_bytes";
@ -93,8 +101,8 @@ public class CaptureService extends VpnService implements Runnable {
// Retrieve Configuration
public_dns = Utils.getDnsServer(getApplicationContext());
vpn_dns = "10.215.173.2";
vpn_ipv4 = "10.215.173.1";
vpn_dns = VPN_VIRTUAL_DNS_SERVER;
vpn_ipv4 = VPN_IP_ADDRESS;
uid_filter = settings.getInt(Prefs.PREF_UID_FILTER);
collector_address = Prefs.getCollectorIp(prefs);

2
app/src/main/java/com/emanuelef/remote_capture/StatusFragment.java
View File

@ -159,7 +159,7 @@ public class StatusFragment extends Fragment implements AppStateListener {
case HTTP_SERVER:
modeName = getResources().getString(R.string.http_server);
info = String.format(getResources().getString(R.string.http_server_status),
Utils.getLocalIPAddress(), CaptureService.getHTTPServerPort());
Utils.getLocalIPAddress(mActivity), CaptureService.getHTTPServerPort());
break;
case UDP_EXPORTER:
modeName = getResources().getString(R.string.udp_exporter);

109
app/src/main/java/com/emanuelef/remote_capture/Utils.java
View File

@ -7,19 +7,26 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.net.ConnectivityManager;
import android.net.LinkProperties;
import android.net.Network;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Build;
import android.text.format.Formatter;
import android.util.Log;
import java.math.BigInteger;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.UnknownHostException;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.List;
public class Utils {
public static String formatBytes(long bytes) {
static String formatBytes(long bytes) {
long divisor;
String suffix;
if(bytes < 1024) return bytes + " B";
@ -31,7 +38,7 @@ public class Utils {
return String.format("%.1f %s", ((float)bytes) / divisor, suffix);
}
public static String formatPkts(long pkts) {
static String formatPkts(long pkts) {
long divisor;
String suffix;
if(pkts < 1000) return Long.toString(pkts);
@ -43,7 +50,7 @@ public class Utils {
return String.format("%.1f %s", ((float)pkts) / divisor, suffix);
}
public static String formatDuration(long seconds) {
static String formatDuration(long seconds) {
if(seconds == 0)
return "< 1 s";
else if(seconds < 60)
@ -54,7 +61,7 @@ public class Utils {
return String.format("> %d h", seconds / 3600);
}
public static List<AppDescriptor> getInstalledApps(Context context) {
static List<AppDescriptor> getInstalledApps(Context context) {
PackageManager pm = context.getPackageManager();
List<AppDescriptor> apps = new ArrayList<>();
List<PackageInfo> packs = pm.getInstalledPackages(0);
@ -81,7 +88,7 @@ public class Utils {
return apps;
}
public static String proto2str(int proto) {
static String proto2str(int proto) {
switch(proto) {
case 6: return "TCP";
case 17: return "UDP";
@ -90,17 +97,22 @@ public class Utils {
}
}
public static String getDnsServer(Context context) {
static String getDnsServer(Context context) {
ConnectivityManager conn = (ConnectivityManager) context.getSystemService(Service.CONNECTIVITY_SERVICE);
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
Network net = conn.getActiveNetwork();
if(conn != null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
Network net = conn.getActiveNetwork();
if(net != null) {
List<InetAddress> dns_server = conn.getLinkProperties(net).getDnsServers();
if (net != null) {
LinkProperties props = conn.getLinkProperties(net);
for(InetAddress server : dns_server) {
return server.getHostAddress();
if(props != null) {
List<InetAddress> dns_servers = props.getDnsServers();
if (dns_servers.size() > 0)
return dns_servers.get(0).getHostAddress();
}
}
}
}
@ -109,24 +121,77 @@ public class Utils {
return "8.8.8.8";
}
public static String getLocalIPAddress() {
// https://gist.github.com/mathieugerard/0de2b6f5852b6b0b37ed106cab41eba1
static String getLocalWifiIpAddress(Context context) {
WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
WifiInfo connInfo = wifiManager.getConnectionInfo();
if(connInfo != null) {
int ipAddress = connInfo.getIpAddress();
if (ByteOrder.nativeOrder().equals(ByteOrder.LITTLE_ENDIAN)) {
ipAddress = Integer.reverseBytes(ipAddress);
}
byte[] ipByteArray = BigInteger.valueOf(ipAddress).toByteArray();
String ipAddressString;
try {
ipAddressString = InetAddress.getByAddress(ipByteArray).getHostAddress();
} catch (UnknownHostException ex) {
return(null);
}
return ipAddressString;
}
return(null);
}
static String getLocalIPAddress(Context context) {
InetAddress vpn_ip;
try {
vpn_ip = InetAddress.getByName(CaptureService.VPN_IP_ADDRESS);
} catch (UnknownHostException e) {
return "";
}
// try to get the WiFi IP address first
String wifi_ip = getLocalWifiIpAddress(context);
if(wifi_ip != null) {
Log.d("getLocalIPAddress", "Using WiFi IP: " + wifi_ip);
return wifi_ip;
}
// otherwise search for other network interfaces
// https://stackoverflow.com/questions/6064510/how-to-get-ip-address-of-the-device-from-code
try {
List<NetworkInterface> interfaces = Collections.list(NetworkInterface.getNetworkInterfaces());
for (NetworkInterface intf : interfaces) {
List<InetAddress> addrs = Collections.list(intf.getInetAddresses());
for (InetAddress addr : addrs) {
if (!addr.isLoopbackAddress() && addr.isSiteLocalAddress() /* Exclude public IPs */) {
String sAddr = addr.getHostAddress();
boolean isIPv4 = sAddr.indexOf(':')<0;
if(!intf.isVirtual()) {
List<InetAddress> addrs = Collections.list(intf.getInetAddresses());
for (InetAddress addr : addrs) {
if (!addr.isLoopbackAddress()
&& addr.isSiteLocalAddress() /* Exclude public IPs */
&& !addr.equals(vpn_ip)) {
String sAddr = addr.getHostAddress();
boolean isIPv4 = sAddr.indexOf(':') < 0;
if(isIPv4)
return sAddr;
if (isIPv4) {
Log.d("getLocalIPAddress", "Using interface '" + intf.getName() + "' IP: " + sAddr);
return sAddr;
}
}
}
}
}
} catch (Exception ignored) { }
return "";
// Fallback
Log.d("getLocalIPAddress", "Using fallback IP");
return "127.0.0.1";
}
public static long now() {
@ -134,7 +199,7 @@ public class Utils {
return(calendar.getTimeInMillis() / 1000);
}
public static byte[] hexStringToByteArray(String s) {
static byte[] hexStringToByteArray(String s) {
int len = s.length();
byte[] data = new byte[len / 2];
for (int i = 0; i < len; i += 2) {