Hinzugefuegt:

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

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 8384253505690daf2f3d9f453a621bca5a4e60e7..43927f553ae4fae5cd26ab48fe624c8f152647fd 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -23,7 +23,7 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -74,6 +74,40 @@ push(@network, '127.0.0.1');
 push(@masklen, '255.255.255.255' );
 push(@colour, ${Header::colourfw} );
 
+# Add OpenVPN net and RED/BLUE/ORANGE entry (when appropriate)
+if (-e "${General::swroot}/ovpn/settings") {
+    my %ovpnsettings = ();    
+    &General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
+    my @tempovpnsubnet = split("\/",$ovpnsettings{'DOVPN_SUBNET'});
+
+    # add OpenVPN net
+               push(@network, $tempovpnsubnet[0]);
+               push(@masklen, $tempovpnsubnet[1]);
+               push(@colour, ${Header::colourovpn} );
+
+    if ( ($ovpnsettings{'ENABLED'} eq 'on') && open(IP, "${General::swroot}/red/local-ipaddress") ) {
+      # add RED:port / proto
+                 my $redip = <IP>;
+               close(IP);
+               chomp $redip;
+                 push(@network, $redip );
+               push(@masklen, '255.255.255.255' );
+               push(@colour, ${Header::colourovpn} );
+    }
+    if ( ($ovpnsettings{'ENABLED_BLUE'} eq 'on') && $netsettings{'BLUE_DEV'} ) {
+      # add BLUE:port / proto
+       push(@network, $netsettings{'BLUE_ADDRESS'} );
+       push(@masklen, '255.255.255.255' );
+               push(@colour, ${Header::colourovpn} );
+    }
+    if ( ($ovpnsettings{'ENABLED_ORANGE'} eq 'on') && $netsettings{'ORANGE_DEV'} ) {
+      # add ORANGE:port / proto
+       push(@network, $netsettings{'ORANGE_ADDRESS'} );
+       push(@masklen, '255.255.255.255' );
+               push(@colour, ${Header::colourovpn} );
+    }
+}
+
 # Add Orange Network
 if ($netsettings{'ORANGE_DEV'}) {
        push(@network, $netsettings{'ORANGE_NETADDRESS'});
@@ -368,8 +402,9 @@ print <<END
     <td align='center' bgcolor='${Header::colourred}'><b><font color='#FFFFFF'>$Lang::tr{'internet'}</font></b></td>
     <td align='center' bgcolor='${Header::colourorange}'><b><font color='#FFFFFF'>$Lang::tr{'dmz'}</font></b></td>
     <td align='center' bgcolor='${Header::colourblue}'><b><font color='#FFFFFF'>$Lang::tr{'wireless'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourfw}'><b><font color='#FFFFFF'>IPCop</font></b></td>
+    <td align='center' bgcolor='${Header::colourfw}'><b><font color='#FFFFFF'>IPFire</font></b></td>
     <td align='center' bgcolor='${Header::colourvpn}'><b><font color='#FFFFFF'>$Lang::tr{'vpn'}</font></b></td>
+    <td align='center' bgcolor='${Header::colourovpn}'><b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b></td>
 </tr>
 </table>
 <br />