From ff1ed674e01b7db0acd4a565dc74cca01b825f6b Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 11 Dec 2012 12:16:54 +0100
Subject: [PATCH] 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.
---
 config/rootfiles/core/65/filelists/files | 1 +
 html/cgi-bin/routing.cgi                 | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index 67bd0b38e..4953f192d 100644
--- 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
+srv/web/ipfire/cgi-bin/routing.cgi
 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 86e04293a..afcd38822 100644
--- 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'}) {
+	# Convert subnet masks to CIDR notation.
+	$settings{'IP'} = &General::iporsubtocidr($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';
-}
\ No newline at end of file
+}
-- 
2.39.2