From d961332adcdbad97db613e872d7ad6996c89609d Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Mon, 19 May 2008 03:38:01 +0000 Subject: [PATCH] getting netmask right in ipv6dialog --- src/gui/IPv6Dialog.cpp | 3 ++- src/gui/NetworkDialogIPv6.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/IPv6Dialog.cpp b/src/gui/IPv6Dialog.cpp index 8bc53f5ed..a08d5e07f 100644 --- a/src/gui/IPv6Dialog.cpp +++ b/src/gui/IPv6Dialog.cpp @@ -115,7 +115,8 @@ void IPv6Dialog::loadFWObject(FWObject *o) try { if ( Interface::isA( obj->getParent() ) ) - m_dialog->netmask->setText( s->getNetmaskPtr()->toString().c_str()); + m_dialog->netmask->setText( + s->getNetmaskPtr(true)->toString().c_str()); } catch (FWException &ex) {} //apply->setEnabled( false ); diff --git a/src/gui/NetworkDialogIPv6.cpp b/src/gui/NetworkDialogIPv6.cpp index 325469bf0..22c82eeee 100644 --- a/src/gui/NetworkDialogIPv6.cpp +++ b/src/gui/NetworkDialogIPv6.cpp @@ -127,7 +127,7 @@ void NetworkDialogIPv6::validate(bool *res) bool ok = false; int range =m_dialog->netmask->text().toInt(&ok); - if (ok&&range>=0&&range<128) + if (ok && range >= 0 && range < 128) { } else