From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] BUG10941: fix single ip-addresses when no subnet given Date: Sat, 17 Oct 2015 19:27:03 +0200 Message-ID: <1445102823-4342-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1092343777785593341==" List-Id: --===============1092343777785593341== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Some functions when adding a new route where senseless. Now the ip address is checked and in case of a missing / wrong subnetmask an errormessage is raised. The ip address is preserved. ELSE we convert the subnetmask to cidr notation and calculate the network ip correctly. Signed-off-by: Alexander Marx --- html/cgi-bin/routing.cgi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index c460a74..2c60f67 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -118,12 +118,16 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable dis= able'}) { } =20 if ($settings{'ACTION'} eq $Lang::tr{'add'}) { - # Convert subnet masks to CIDR notation. - $settings{'IP'} =3D &General::iporsubtocidr($settings{'IP'}); =20 -# Validate inputs - if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask(= $settings{'IP'}))){ + # Validate inputs + if (!&General::validipandmask($settings{'IP'}))){ $errormessage =3D $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'= }; + }else{ + #set networkip if not already correctly defined + my($ip,$cidr) =3D split(/\//,$settings{'IP'}); + $cidr =3D &General::iporsubtocidr($cidr); + my $netip=3D&General::getnetworkip($ip,$cidr); + $settings{'IP'} =3D "$netip/$cidr"; } =20 if ($settings{'IP'} =3D~ /^0\.0\.0\.0/){ --=20 1.9.1 --===============1092343777785593341==--