From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 28 Sep 2015 13:24:44 +0000 (+0100)
Subject: connections.cgi: Support multiple subnets for IPsec
X-Git-Tag: v2.17-core95~65^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6fba315ecd044bd53350641c2e6f27d9df785de;p=ipfire-2.x.git

connections.cgi: Support multiple subnets for IPsec

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 4eb9cd7bfe..85a9cd7450 100644
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -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") {