cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tls-psk: reformat getIPAddress method

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-06-12 13:17:55 +02:00
parent e470072210
commit fa3a82ded2
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/network/KeyTransferInteractor.java
View File

@@ -404,25 +404,23 @@ public class KeyTransferInteractor {
*/ */
private static String getIPAddress(boolean useIPv4) { private static String getIPAddress(boolean useIPv4) {
try { try {
List<NetworkInterface> interfaces = Collections.list(NetworkInterface. List<NetworkInterface> interfaces = Collections.list(NetworkInterface.getNetworkInterfaces());
getNetworkInterfaces());
for (NetworkInterface intf : interfaces) { for (NetworkInterface intf : interfaces) {
List<InetAddress> addrs = Collections.list(intf.getInetAddresses()); List<InetAddress> addrs = Collections.list(intf.getInetAddresses());
for (InetAddress addr : addrs) { for (InetAddress addr : addrs) {
if (!addr.isLoopbackAddress()) { if (addr.isLoopbackAddress()) {
String sAddr = addr.getHostAddress(); continue;
boolean isIPv4 = sAddr.indexOf(':') < 0; }
String sAddr = addr.getHostAddress();
if (useIPv4) { boolean isIPv4 = sAddr.indexOf(':') < 0;
if (isIPv4) if (isIPv4 && useIPv4) {
return sAddr; return sAddr;
} else { } else if (!isIPv4) {
if (!isIPv4) { int delimIndex = sAddr.indexOf('%'); // drop ip6 zone suffix
int delim = sAddr.indexOf('%'); // drop ip6 zone suffix if (delimIndex >= 0) {
return delim < 0 ? sAddr.toUpperCase() : sAddr.substring(0, delim). sAddr = sAddr.substring(0, delimIndex);
toUpperCase();
}
} }
return sAddr.toUpperCase();
} }
} }
} }