routing.cgi: Allow adding static routes with subnet masks.

It was not possible to enter networks in the subnet mask notation,
which is fixed by this patch.

Fixes #10219.

diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index 67bd0b38e6cea32fbd7cf596cdb2f35e02cef36c..4953f192ded33167903c71683b3836ac3cd58116 100644 (file)
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -3,6 +3,7 @@ etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 etc/issue
 srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat
 srv/web/ipfire/cgi-bin/ovpnmain.cgi

+srv/web/ipfire/cgi-bin/routing.cgi

 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/sbin/ovpn-ccd-convert
 var/ipfire/general-functions.pl
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/sbin/ovpn-ccd-convert
 var/ipfire/general-functions.pl

diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi
index 86e04293a406ada5098ee950a8e72818b02944fb..afcd38822d6fff49a5d0c592e1431df074d6ce99 100644 (file)
--- a/html/cgi-bin/routing.cgi
+++ b/html/cgi-bin/routing.cgi
@@ -118,6 +118,8 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) {
 }
 
 if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
 }
 
 if ($settings{'ACTION'} eq $Lang::tr{'add'}) {

+       # Convert subnet masks to CIDR notation.
+       $settings{'IP'} = &General::iporsubtocidr($settings{'IP'});

 
 # Validate inputs
        if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){
 
 # Validate inputs
        if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){


@@ -443,4 +445,4 @@ sub SortDataFile
 #
 sub BuildConfiguration {
     system '/usr/local/bin/rebuildroutes';
 #
 sub BuildConfiguration {
     system '/usr/local/bin/rebuildroutes';

-}
\ No newline at end of file
+}