android: Add ability to add a range set to another

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 3ced7bb828a5294ef8feccaef4f9637942a925d6..d5f4b619f39ca8f429c785e8188ada8be2c8588a 100644 (file)
--- 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
@@ -84,6 +84,21 @@ public class IPRangeSet implements Iterable<IPRange>
                }
        }
 
+       /**
+        * Add all ranges from the given set.
+        */
+       public void add(IPRangeSet ranges)
+       {
+               if (ranges == this)
+               {
+                       return;
+               }
+               for (IPRange range : ranges.mRanges)
+               {
+                       add(range);
+               }
+       }
+
        /**
         * Add all ranges from the given collection to this set.
         */

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 659525b59feed851d601447a108a17680fe4570c..3b054ceed22430d44db0e1d61d03a24cc94f76a8 100644 (file)
--- 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
@@ -142,6 +142,33 @@ public class IPRangeSetTest
                                          new IPRange("255.255.255.255/32"));
        }
 
+       @Test
+       public void testAddSet() throws UnknownHostException
+       {
+               IPRangeSet set = new IPRangeSet();
+               IPRangeSet other = new IPRangeSet();
+               other.add(new IPRange("192.168.1.0/24"));
+               other.add(new IPRange("10.0.1.0/24"));
+               other.add(new IPRange("255.255.255.255/32"));
+               set.add(other);
+               assertEquals("size", 3, set.size());
+               assertSubnets(set, new IPRange("10.0.1.0/24"), new IPRange("192.168.1.0/24"),
+                                         new IPRange("255.255.255.255/32"));
+       }
+
+       @Test
+       public void testAddSetIdent() throws UnknownHostException
+       {
+               IPRangeSet set = new IPRangeSet();
+               set.add(new IPRange("192.168.1.0/24"));
+               set.add(new IPRange("10.0.1.0/24"));
+               set.add(new IPRange("255.255.255.255/32"));
+               set.add(set);
+               assertEquals("size", 3, set.size());
+               assertSubnets(set, new IPRange("10.0.1.0/24"), new IPRange("192.168.1.0/24"),
+                                         new IPRange("255.255.255.255/32"));
+       }
+
        @Test
        public void testRemoveNothing() throws UnknownHostException
        {