onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-06-24 01:49:36 +02:00
Code Issues Releases Wiki Activity

fixes #2641 "newFirewall dialog does not accept ipv6 addresses with

Browse Source 
long prefixes". The dialog did not allow ipv6 addresses of inetrfaces
with netmask > 64 bit.
This commit is contained in:
Vadim Kurland
2011-08-11 16:03:58 -07:00
parent 1651e9c73a
commit 1da73349d5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/ChangeLog
View File

@@ -1,5 +1,10 @@
2011-08-11 Vadim Kurland <vadim@netcitadel.com>
* InterfaceEditorWidget.cpp (validateAddress): fixes #2641
"newFirewall dialog does not accept ipv6 addresses with long
prefixes". The dialog did not allow ipv6 addresses of inetrfaces
with netmask > 64 bit.
* newFirewallDialog.cpp (cleanup): fixes #2642 "GUI crashes if
user cancels newFirewall dialog".

3
src/libgui/InterfaceEditorWidget.cpp
View File

@@ -377,6 +377,7 @@ bool InterfaceEditorWidget::validateAddress(const QString &addr,
bool regular,
bool ipv6)
{
if ( regular && ( addr.isEmpty() || netm.isEmpty() ) )
{
setError("Firewall Builder", tr("Empty address or netmask field"));
@@ -400,7 +401,7 @@ bool InterfaceEditorWidget::validateAddress(const QString &addr,
int ilen = netm.toInt (&ok);
if (ok)
{
if (ilen < 0 || (!ipv6 && (ilen > 32)) || (ilen>64) )
if (ilen < 0 || (ipv6 && ilen > 128) || (!ipv6 && ilen > 32))
{
setError("Firewall Builder",
tr("Invalid netmask '%1/%2'").arg(addr).arg(netm));