Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Support IPv6 SLAAC addresses.

Browse Source
This commit is contained in:
akwizgran
2020-02-17 11:07:14 +00:00
parent 2bd2f67693
commit e1084ffadd
8 changed files with 279 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java
View File

@@ -83,7 +83,12 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
}
@Override
protected List<InetAddress> getUsableLocalInetAddresses() {
protected List<InetAddress> getUsableLocalInetAddresses(boolean ipv4) {
if (ipv4) return getUsableLocalIpv4Addresses();
else return getUsableLocalIpv6Addresses();
}
private List<InetAddress> getUsableLocalIpv4Addresses() {
// If the device doesn't have wifi, don't open any sockets
if (wifiManager == null) return emptyList();
// If we're connected to a wifi network, return its address
@@ -100,6 +105,17 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
return emptyList();
}
private List<InetAddress> getUsableLocalIpv6Addresses() {
// If the device doesn't have wifi, don't open any sockets
if (wifiManager == null) return emptyList();
// If we have a SLAAC address, return it
for (InetAddress addr : getLocalInetAddresses()) {
if (isSlaacAddress(addr)) return singletonList(addr);
}
// No suitable addresses
return emptyList();
}
private InetAddress intToInetAddress(int ip) {
byte[] ipBytes = new byte[4];
ipBytes[0] = (byte) (ip & 0xFF);
@@ -150,12 +166,13 @@ class AndroidLanTcpPlugin extends LanTcpPlugin {
} else if (addrs.isEmpty()) {
LOG.info("Not connected to wifi");
socketFactory = SocketFactory.getDefault();
// Server socket may not have been closed automatically when
// interface was taken down. Socket will be cleared and state
// Server sockets may not have been closed automatically when
// interface was taken down. Sockets will be cleared and state
// updated in acceptContactConnections()
if (s == ACTIVE) {
LOG.info("Closing server socket");
tryToClose(state.getServerSocket(), LOG, WARNING);
LOG.info("Closing server sockets");
tryToClose(state.getServerSocket(true), LOG, WARNING);
tryToClose(state.getServerSocket(false), LOG, WARNING);
}
} else {
LOG.info("Connected to wifi");