From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 21 Sep 2015 23:26:14 +0000 (+0100)
Subject: firewall: Support multiple subnets per IPsec tunnel
X-Git-Tag: v2.17-core95~65^2~4^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=7c8e022c4b3c7d184e4cee8f79b5e7d63f464759

firewall: Support multiple subnets per IPsec tunnel

Fixes #10929

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

diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl
index b389fac3c3..eabd9a42f2 100644
--- a/config/firewall/firewall-lib.pl
+++ b/config/firewall/firewall-lib.pl
@@ -391,8 +391,9 @@ sub get_address
 	# IPsec networks.
 	} elsif ($key ~~ ["ipsec_net_src", "ipsec_net_tgt", "IpSec Network"]) {
 		my $network_address = &get_ipsec_net_ip($value, 11);
-		if ($network_address) {
-			push(@ret, [$network_address, ""]);
+		my @nets = split(/\|/, $network_address);
+		foreach my $net (@nets) {
+			push(@ret, [$net, ""]);
 		}
 
 	# The firewall's own IP addresses.