From d9ac41d55627c3b870e88ac9d9dff5f3820331f5 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 19 Jul 2012 12:42:35 +0200
Subject: [PATCH] connections.cgi: Correctly colour OpenVPN n2n connections.

---
 html/cgi-bin/connections.cgi | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 54089d0bbc..291f579a51 100644
--- 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');
-- 
2.39.2