Merge remote-tracking branch 'amarx/10538' into next

diff --combined config/cfgroot/general-functions.pl
index 6fabf1c0583a0c9c2e5fa90f4966028671dffae0,19cfebb687db57ea72eae13ff88df365dcebe1a1..1ef014a66cf67d303f8a32cf8dd2da5786542d5a
--- 1/config/cfgroot/general-functions.pl
--- 2/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@@ -413,9 -413,9 +413,9 @@@ sub getnetworki
        #Gets:  IP, CIDR    (10.10.10.0-255, 24)
        #Gives:  10.10.10.0
        my ($ccdip,$ccdsubnet) = @_;
 -      my $ip_address_binary = inet_aton( $ccdip );
 -      my $netmask_binary    = ~pack("N", (2**(32-$ccdsubnet))-1);
 -      my $network_address    = inet_ntoa( $ip_address_binary & $netmask_binary );
 +      my $ip_address_binary = &Socket::inet_pton( AF_INET,$ccdip );
 +      my $netmask_binary = &Socket::inet_pton(AF_INET,&iporsubtodec($ccdsubnet));
 +      my $network_address    = &Socket::inet_ntop( AF_INET,$ip_address_binary & $netmask_binary );
        return $network_address;
  }
  
@@@ -598,6 -598,19 +598,19 @@@ sub checksubnet
        if (($ownnet{'RED_NETADDRESS'}          ne '' && $ownnet{'RED_NETADDRESS'}              ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
  }
  
+ sub check_net_internal{
+       my $network=shift;
+       my ($ip,$cidr)=split(/\//,$network);
+       my %ownnet=();
+       my $errormessage;
+       $cidr=&iporsubtocidr($cidr);
+       #check if we use one of ipfire's networks (green,orange,blue)
+       &readhash("${General::swroot}/ethernet/settings", \%ownnet);
+       if (($ownnet{'GREEN_NETADDRESS'}        ne '' && $ownnet{'GREEN_NETADDRESS'}    ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($ownnet{'GREEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
+       if (($ownnet{'ORANGE_NETADDRESS'}       ne '' && $ownnet{'ORANGE_NETADDRESS'}   ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ownnet{'ORANGE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
+       if (($ownnet{'BLUE_NETADDRESS'}         ne '' && $ownnet{'BLUE_NETADDRESS'}     ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{'BLUE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
+       if (($ownnet{'RED_NETADDRESS'}          ne '' && $ownnet{'RED_NETADDRESS'}              ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
+ }
  
  sub validport
  {
@@@ -760,21 -773,12 +773,21 @@@ sub validportrange # used to check a po
  # Return: TRUE/FALSE
  sub IpInSubnet
  {
 -    my $ip = unpack('N', &Socket::inet_aton(shift));
 -    my $start = unpack('N', &Socket::inet_aton(shift));
 -    my $mask  = unpack('N', &Socket::inet_aton(shift));
 -       $start &= $mask;  # base of subnet...
 -    my $end   = $start + ~$mask;
 -    return (($ip >= $start) && ($ip <= $end));
 +      my $addr = shift;
 +      my $network = shift;
 +      my $netmask = shift;
 +
 +      my $addr_num = &Socket::inet_pton(AF_INET,$addr);
 +      my $network_num = &Socket::inet_pton(AF_INET,$network);
 +      my $netmask_num = &Socket::inet_pton(AF_INET,$netmask);
 +
 +      # Find start address
 +      my $network_start = $network_num & $netmask_num;
 +
 +      # Find end address
 +      my $network_end = $network_start ^ ~$netmask_num;
 +
 +      return (($addr_num ge $network_start) && ($addr_num le $network_end));
  }
  
  #

diff --combined html/cgi-bin/ovpnmain.cgi
index b2ce05e97ac8f1b75ca6d972eecb39725dbe96a9,ab6a4fe2bc5cbf5e12b7ae67e9cce9228a4d2490..0cb41696fb58db26c1f61368ee5595c0d8ac52b7
--- 1/html/cgi-bin/ovpnmain.cgi
--- 2/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@@ -1519,6 -1519,17 +1519,6 @@@ EN
        exit(0);
      }
  
 -###
 -### Download Diffie-Hellman parameter
 -###
 -}elsif ($cgiparams{'ACTION'} eq $Lang::tr{'download dh parameter'}) {
 -    if ( -f "${General::swroot}/ovpn/ca/dh1024.pem" ) {
 -      print "Content-Type: application/octet-stream\r\n";
 -      print "Content-Disposition: filename=dh1024.pem\r\n\r\n";
 -      print `/usr/bin/openssl dhparam -in ${General::swroot}/ovpn/ca/dh1024.pem`;
 -      exit(0);
 -    }
 -
  ###
  ### Download tls-auth key
  ###
@@@ -5041,7 -5052,7 +5041,7 @@@ EN
        my $id = 0;
        my $gif;
        my $col1="";
-       foreach my $key (sort { ncmp ($confighash{$a}[1],$confighash{$b}[1]) } keys %confighash) {
+       foreach my $key (sort { ncmp ($confighash{$a}[3],$confighash{$b}[3]) } sort { ncmp ($confighash{$a}[1],$confighash{$b}[1]) } keys %confighash) {
        if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
        if ($id % 2) {
                print "<tr>";