Merge remote-tracking branch 'earl/tor' into next

[ipfire-2.x.git] / html / cgi-bin / connections.cgi

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index c7220f62d164b46dc2c63b34178cdc2e0df2f600..5c17d33e276a51c4a90bda383e2c616af012c818 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -238,6 +238,23 @@ if (-e "${General::swroot}/ovpn/settings") {
        }
 }
 
+# Add OpenVPN net for custom OVPNs
+if (-e "${General::swroot}/ovpn/ccd.conf") {
+       open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf");      
+       my @ovpnsub = <OVPNSUB>;
+       close(OVPNSUB);
+
+       foreach (@ovpnsub) {
+               my ($network, $mask) = split '/', (split ',', $_)[2];
+               
+               $mask = ipv4_cidr2msk($mask) unless &General::validip($mask);
+
+               push(@network, $network);
+               push(@masklen, $mask);
+               push(@colour, ${Header::colourovpn});
+       }
+}
+
 open(IPSEC, "${General::swroot}/vpn/config");
 my @ipsec = <IPSEC>;
 close(IPSEC);
@@ -503,7 +520,8 @@ foreach my $line (@conntrack) {
        }
 
        my $sip_colour = ipcolour($sip);
-       my $dip_colour = ipcolour($dip);
+       # use colour of destination network for DNAT
+       my $dip_colour = $dip ne $dip_ret ? ipcolour($dip_ret) : ipcolour($dip);
 
        my $sserv = '';
        if ($sport < 1024) {