connections.cgi: Correctly colour OpenVPN n2n connections.

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 54089d0bbc6ebd6b684957a07ea8f46dbbf3a03e..291f579a51d57b9e700cd2acc49e03ab450051a9 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -173,7 +173,7 @@ if (-e "${General::swroot}/ovpn/settings") {
        }
 }
 
-open(IPSEC, "/var/ipfire/vpn/config");
+open(IPSEC, "${General::swroot}/var/ipfire/vpn/config");
 my @ipsec = <IPSEC>;
 close(IPSEC);
 
@@ -190,6 +190,26 @@ foreach my $line (@ipsec) {
        push(@colour, ${Header::colourvpn});
 }
 
+if (-e "${General::swroot}/ovpn/n2nconf") {
+       open(OVPNN2N, "${General::swroot}/ovpn/ovpnconfig");
+       my @ovpnn2n = <OVPNN2N>;
+       close(OVPNN2N);
+
+       foreach my $line (@ovpnn2n) {
+               my @ovpn = split(',', $line);
+               next if ($ovpn[4] ne 'net');
+
+               my ($network, $mask) = split("/", $ovpn[12]);
+               if (!&General::validip($mask)) {
+                       $mask = ipv4_cidr2msk($mask);
+               }
+
+               push(@network, $network);
+               push(@masklen, $mask);
+               push(@colour, ${Header::colourovpn});
+       }
+}
+
 # Show the page.
 &Header::openpage($Lang::tr{'connections'}, 1, '');
 &Header::openbigbox('100%', 'left');