diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-06-28 12:33:17 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-07-03 10:27:55 +0200 |
| commit | 646260f4641db08daa1574374d0c72490913c091 (patch) | |
| tree | 835233c2228e68441b7d2dde54bff3d439a9ee7e /src | |
| parent | 291ef58c69d62ad5aed1817ec9ee7ee9ac3b842f (diff) | |
| download | strongswan-646260f4641db08daa1574374d0c72490913c091.tar.bz2 strongswan-646260f4641db08daa1574374d0c72490913c091.tar.xz | |
android: Change format of address ranges and print sets
Diffstat (limited to 'src')
4 files changed, 24 insertions, 2 deletions
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRange.java b/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRange.java index 621dfd691..6c0aa659b 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRange.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRange.java @@ -241,7 +241,7 @@ public class IPRange implements Comparable<IPRange> { return InetAddress.getByAddress(mFrom).getHostAddress() + "/" + mPrefix; } - return InetAddress.getByAddress(mFrom).getHostAddress() + ".." + + return InetAddress.getByAddress(mFrom).getHostAddress() + "-" + InetAddress.getByAddress(mTo).getHostAddress(); } catch (UnknownHostException ignored) diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRangeSet.java b/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRangeSet.java index d5f4b619f..4716055bb 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRangeSet.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRangeSet.java @@ -205,4 +205,19 @@ public class IPRangeSet implements Iterable<IPRange> { return mRanges.size(); } + + @Override + public String toString() + { /* we could use TextUtils, but that causes the unit tests to fail */ + StringBuilder sb = new StringBuilder(); + for (IPRange range : mRanges) + { + if (sb.length() > 0) + { + sb.append(" "); + } + sb.append(range.toString()); + } + return sb.toString(); + } } diff --git a/src/frontends/android/app/src/test/java/org/strongswan/android/test/IPRangeSetTest.java b/src/frontends/android/app/src/test/java/org/strongswan/android/test/IPRangeSetTest.java index 3b054ceed..af60c15ba 100644 --- a/src/frontends/android/app/src/test/java/org/strongswan/android/test/IPRangeSetTest.java +++ b/src/frontends/android/app/src/test/java/org/strongswan/android/test/IPRangeSetTest.java @@ -302,4 +302,11 @@ public class IPRangeSetTest assertEquals("next", new IPRange("192.168.1.0/24"), iterator.next()); iterator.remove(); } + + @Test + public void testToString() throws UnknownHostException + { + IPRangeSet set = IPRangeSet.fromString("192.168.3.10/24 192.168.1.0/24 192.168.1.1-192.168.1.10"); + assertEquals("string", "192.168.1.0/24 192.168.3.0/24", set.toString()); + } } diff --git a/src/frontends/android/app/src/test/java/org/strongswan/android/test/IPRangeTest.java b/src/frontends/android/app/src/test/java/org/strongswan/android/test/IPRangeTest.java index 15d710e5a..51e976e34 100644 --- a/src/frontends/android/app/src/test/java/org/strongswan/android/test/IPRangeTest.java +++ b/src/frontends/android/app/src/test/java/org/strongswan/android/test/IPRangeTest.java @@ -200,7 +200,7 @@ public class IPRangeTest { testToString("192.168.1.1", "192.168.1.1", "192.168.1.1/32"); testToString("192.168.1.0", "192.168.1.255", "192.168.1.0/24"); - testToString("192.168.1.1", "192.168.1.255", "192.168.1.1..192.168.1.255"); + testToString("192.168.1.1", "192.168.1.255", "192.168.1.1-192.168.1.255"); testToString("0.0.0.0", "255.255.255.255", "0.0.0.0/0"); testToString("fec1::1", "fec1::1", "fec1:0:0:0:0:0:0:1/128"); testToString("fec1::", "fec1::ffff", "fec1:0:0:0:0:0:0:0/112"); |