webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Fixes #10219.
This commit is contained in:
Michael Tremer
2012-12-11 12:16:54 +01:00
parent 1d0fcb09ed
commit ff1ed674e0
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/65/filelists/files
View File

@@ -3,6 +3,7 @@ etc/system-release
etc/issue etc/issue
srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat
srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/routing.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/sbin/ovpn-ccd-convert usr/sbin/ovpn-ccd-convert
var/ipfire/general-functions.pl var/ipfire/general-functions.pl

4
html/cgi-bin/routing.cgi
View File

@@ -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 # Validate inputs
if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){ if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){
@@ -443,4 +445,4 @@ sub SortDataFile
# #
sub BuildConfiguration { sub BuildConfiguration {
system '/usr/local/bin/rebuildroutes'; system '/usr/local/bin/rebuildroutes';
} }