[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, develo
Brought to you by:
mikehorn
From: <gi...@ir...> - 2011-08-11 23:16:18
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Firewall Builder GUI and Policy Compilers Open Source Code". The branch, development has been updated via 1da73349d54c734103146319178369e3b8a7368d (commit) from 1651e9c73a84bb9fb10ea5016a1a4c79dc014d0d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1da73349d54c734103146319178369e3b8a7368d Author: Vadim Kurland <va...@ne...> Date: Thu Aug 11 16:03:58 2011 -0700 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. diff --git a/doc/ChangeLog b/doc/ChangeLog index e85da49..f4e7f33 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,10 @@ 2011-08-11 Vadim Kurland <va...@ne...> + * 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". diff --git a/src/libgui/InterfaceEditorWidget.cpp b/src/libgui/InterfaceEditorWidget.cpp index 0c4ebc5..f7899c6 100644 --- a/src/libgui/InterfaceEditorWidget.cpp +++ b/src/libgui/InterfaceEditorWidget.cpp @@ -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)); ----------------------------------------------------------------------- Summary of changes: doc/ChangeLog | 5 +++++ src/libgui/InterfaceEditorWidget.cpp | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- Firewall Builder GUI and Policy Compilers Open Source Code |