Add network interfaces to debug info

This commit is contained in:
M66B 2016-03-14 14:42:31 +01:00
parent 1a7ddc2599
commit cd6e6f8e3c
1 changed files with 27 additions and 3 deletions

View File

@ -63,6 +63,9 @@ import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.HttpURLConnection;
import java.net.InterfaceAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@ -71,6 +74,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -639,9 +643,7 @@ public class Util {
}
for (NetworkInfo ni : listNI) {
sb.append(ni.getTypeName())
.append('/')
.append(ni.getSubtypeName())
sb.append(ni.getTypeName()).append('/').append(ni.getSubtypeName())
.append(' ').append(ni.getDetailedState())
.append(TextUtils.isEmpty(ni.getExtraInfo()) ? "" : " " + ni.getExtraInfo())
.append(ni.getType() == ConnectivityManager.TYPE_MOBILE ? " " + Util.getNetworkGeneration(ni.getSubtype()) : "")
@ -650,6 +652,28 @@ public class Util {
.append("\r\n");
}
try {
Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces();
if (nis != null) {
sb.append("\r\n");
while (nis.hasMoreElements()) {
NetworkInterface ni = nis.nextElement();
if (ni != null) {
List<InterfaceAddress> ias = ni.getInterfaceAddresses();
if (ias != null)
for (InterfaceAddress ia : ias)
sb.append(ni.getName())
.append(' ').append(ia.getAddress().getHostAddress())
.append('/').append(ia.getNetworkPrefixLength())
.append(' ').append(ni.getMTU())
.append("\r\n");
}
}
}
} catch (Throwable ex) {
sb.append(ex.toString()).append("\r\n");
}
if (sb.length() > 2)
sb.setLength(sb.length() - 2);