]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
connections.cgi: Support multiple subnets for IPsec
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Sep 2015 13:24:44 +0000 (14:24 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Sep 2015 13:24:44 +0000 (14:24 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
html/cgi-bin/connections.cgi

index 4eb9cd7bfe8a8cfadc953facfce9eee53e3acc5a..85a9cd74501452edc39ac6111218f1c88a9e410e 100644 (file)
@@ -261,15 +261,19 @@ close(IPSEC);
 
 foreach my $line (@ipsec) {
        my @vpn = split(',', $line);
-       my ($network, $mask) = split("/", $vpn[12]);
 
-       if (!&General::validip($mask)) {
-               $mask = ipv4_cidr2msk($mask);
-       }
+       my @subnets = split('|', $vpn[12]);
+       for my $subnet (@subnets) {
+               my ($network, $mask) = split("/", $subnet);
+
+               if (!&General::validip($mask)) {
+                       $mask = ipv4_cidr2msk($mask);
+               }
 
-       push(@network, $network);
-       push(@masklen, $mask);
-       push(@colour, ${Header::colourvpn});
+               push(@network, $network);
+               push(@masklen, $mask);
+               push(@colour, ${Header::colourvpn});
+       }
 }
 
 if (-e "${General::swroot}/ovpn/n2nconf") {