fwhosts.cgi: properly fetch configured IPsec N2N subnets

Previously, the getcolor() function did not correctly process IPsec
N2N connections with more than one remote network configured, resulting
in networks mistakenly marked as being part of a VPN connection, or vice
versa.

Fixes: #11235
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Acked-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 35611ac08765d405bf177196bbb4db9737ac2a02..0da771a5a3fac5e56ade8a4d95d331823a9a53eb 100644 (file)
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1974,11 +1974,13 @@ sub getcolor
                #Check if IP is part of a IPsec N2N network
                foreach my $key (sort keys %ipsecconf){
                        if ($ipsecconf{$key}[11]){
-                               my ($a,$b) = split("/",$ipsecconf{$key}[11]);
-                               $b=&General::iporsubtodec($b);
-                               if (&General::IpInSubnet($sip,$a,$b)){
-                                       $tdcolor="<font style='color: $Header::colourvpn;'>$c</font>";
-                                       return $tdcolor;
+                               foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) {
+                                       my ($a,$b) = split("/",$ipsecsubitem);
+                                       $b=&General::iporsubtodec($b);
+                                       if (&General::IpInSubnet($sip,$a,$b)){
+                                               $tdcolor="<font style='color: $Header::colourvpn;'>$c</font>";
+                                               return $tdcolor;
+                                       }
                                }
                        }
                }