denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Ignore IllegalArgumentException for multicast addresses

Browse Source 
Some Android versions seem to reject routes that use multicast addresses.

Fixes #2420.
This commit is contained in:
Tobias Brunner
2017-09-18 11:00:58 +02:00
parent 86c10a958f
commit 66b7a08884
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
+23 -2
View File
@@ -934,7 +934,18 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
ranges.remove(mExcludedSubnets); ranges.remove(mExcludedSubnets);
for (IPRange subnet : ranges.subnets()) for (IPRange subnet : ranges.subnets())
{ {
builder.addRoute(subnet.getFrom(), subnet.getPrefix()); try
{
builder.addRoute(subnet.getFrom(), subnet.getPrefix());
}
catch (IllegalArgumentException e)
{ /* some Android versions don't seem to like multicast addresses here,
* ignore it for now */
if (!subnet.getFrom().isMulticastAddress())
{
throw e;
}
}
} }
} }
else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
@@ -964,7 +975,17 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
ranges.remove(mExcludedSubnets); ranges.remove(mExcludedSubnets);
for (IPRange subnet : ranges.subnets()) for (IPRange subnet : ranges.subnets())
{ {
builder.addRoute(subnet.getFrom(), subnet.getPrefix()); try
{
builder.addRoute(subnet.getFrom(), subnet.getPrefix());
}
catch (IllegalArgumentException e)
{
if (!subnet.getFrom().isMulticastAddress())
{
throw e;
}
}
} }
} }
else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)