sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not include scope in ipv6 annoucment

This commit is contained in:
Daniel Gultsch 2019-09-08 17:44:26 +02:00
parent 9129c9acde
commit dd9777a6b7
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/eu/siacs/conversations/xmpp/jingle/DirectConnectionUtils.java
View File

@ -1,8 +1,10 @@
package eu.siacs.conversations.xmpp.jingle; package eu.siacs.conversations.xmpp.jingle;
import java.net.Inet6Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.NetworkInterface; import java.net.NetworkInterface;
import java.net.SocketException; import java.net.SocketException;
import java.net.UnknownHostException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Enumeration; import java.util.Enumeration;
@ -29,7 +31,16 @@ public class DirectConnectionUtils {
if (inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress()) { if (inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress()) {
continue; continue;
} }
addresses.add(inetAddress); if (inetAddress instanceof Inet6Address) {
//let's get rid of scope
try {
addresses.add(Inet6Address.getByAddress(inetAddress.getAddress()));
} catch (UnknownHostException e) {
//ignored
}
} else {
addresses.add(inetAddress);
}
} }
} }
return addresses; return addresses;