onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-11 03:24:57 +02:00
Code Issues Releases Wiki Activity

fixed #1770 Eliminated pause

Browse Source 
that happened when user switched from page 0 to page 1 of the new
firewall wizard. Pause was caused by the DNS queries the program
ran trying to determine ip address of the firewall using the name
provided on the first page of the wizard. Now DNS query is
launched only if user wants to create interfaces uses snmp scan.
This commit is contained in:
Vadim Kurland
2010-10-05 00:24:32 +00:00
parent 7ccb7a1e38
commit 9a097d18c9
5 changed files with 63 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@@ -1 +1 @@
#define BUILD_NUM 3316
#define BUILD_NUM 3317

7
doc/ChangeLog
View File

@@ -1,5 +1,12 @@
2010-10-04 Vadim Kurland <vadim@vk.crocodile.org>
* newFirewallDialog.cpp (changed): fixed #1770 Eliminated pause
that happened when user switched from page 0 to page 1 of the new
firewall wizard. Pause was caused by the DNS queries the program
ran trying to determine ip address of the firewall using the name
provided on the first page of the wizard. Now DNS query is
launched only if user wants to create interfaces uses snmp scan.
* InterfaceEditorWidget.cpp (InterfaceEditorWidget): fixed #1772
improved design of the widget used to edit ip addresses and other
attributes of an interface in the new firewall, new host and new

91
src/gui/newFirewallDialog.cpp
View File

@@ -80,7 +80,8 @@ using namespace std;
newFirewallDialog::newFirewallDialog(QWidget *parentw, FWObject *_p) : QDialog(parentw)
newFirewallDialog::newFirewallDialog(QWidget *parentw, FWObject *_p) :
QDialog(parentw)
{
parent = _p;
db = parent->getRoot();
@@ -226,7 +227,9 @@ void newFirewallDialog::changed()
int p = currentPage();
if (fwbdebug)
qDebug() << "newFirewallDialog::changed page=" << p;
qDebug() << "newFirewallDialog::changed() page=" << p
<< "use_manual=" << m_dialog->use_manual->isChecked()
<< "use_snmp=" << m_dialog->use_snmp->isChecked();
if (p==0)
{
@@ -238,32 +241,63 @@ void newFirewallDialog::changed()
QString host_os = readHostOS(m_dialog->hostOS);
m_dialog->interfaceEditor1->setHostOS(host_os);
m_dialog->interfaceEditor2->setHostOS(host_os);
m_dialog->obj_name->setFocus(Qt::OtherFocusReason);
}
if (p==1)
{
bool f;
bool use_snmp = false;
#ifdef HAVE_LIBSNMP
f = m_dialog->use_snmp->isChecked();
use_snmp = m_dialog->use_snmp->isChecked();
#else
f = false;
m_dialog->use_snmp->setEnabled( f );
use_snmp = false;
m_dialog->use_snmp->setEnabled( use_snmp );
#endif
m_dialog->snmpIP->setEnabled( f );
m_dialog->snmp_community->setEnabled( f );
m_dialog->snmpQuery->setEnabled( f );
m_dialog->snmpProgress->setEnabled( f );
if ( f ) m_dialog->snmp_community->setFocus();
m_dialog->snmpIP->setEnabled( use_snmp );
m_dialog->snmp_community->setEnabled( use_snmp );
m_dialog->snmpQuery->setEnabled( use_snmp );
m_dialog->snmpProgress->setEnabled( use_snmp );
if ( use_snmp ) m_dialog->snmp_community->setFocus();
f = m_dialog->use_manual->isChecked() || snmpPollCompleted;
setNextEnabled( 1, f );
if (use_snmp)
{
getIPAddressOfFirewallByName();
}
use_snmp = m_dialog->use_manual->isChecked() || snmpPollCompleted;
setNextEnabled( 1, use_snmp );
}
if (fwbdebug)
qDebug() << "newFirewallDialog::changed() done";
}
void newFirewallDialog::monitor()
void newFirewallDialog::getIPAddressOfFirewallByName()
{
getInterfacesBusy = true;
m_dialog->snmpIP->setText("");
QString name = m_dialog->obj_name->text().toLatin1().constData();
QApplication::setOverrideCursor( QCursor( Qt::WaitCursor) );
QString addr = getAddrByName(name, AF_INET);
QApplication::restoreOverrideCursor();
if (!addr.isEmpty())
m_dialog->snmpIP->setText(addr);
else
{
QMessageBox::warning(
this,"Firewall Builder",
tr("Address of %1 could not be obtained via DNS")
.arg(m_dialog->obj_name->text()),
"&Continue", QString::null, QString::null, 0, 1 );
}
getInterfacesBusy = false;
}
void newFirewallDialog::monitor()
{
if (logger==NULL || q==NULL) return;
@@ -381,7 +415,8 @@ void newFirewallDialog::getInterfacesViaSNMP()
#endif
}
bool interfaceCompare(libfwbuilder::Interface *first, libfwbuilder::Interface *second)
bool interfaceCompare(libfwbuilder::Interface *first,
libfwbuilder::Interface *second)
{
return first->getName() < second->getName();
}
@@ -459,29 +494,9 @@ void newFirewallDialog::showPage(const int page)
case 1:
{
// page 1 is where we choose to configure interfaces manually or via snmp
m_dialog->snmpIP->setText("");
changed(); // to properly enable/disable widgets
getInterfacesBusy = true;
InetAddr addr;
QString name = m_dialog->obj_name->text().toLatin1().constData();
try
{
QApplication::setOverrideCursor( QCursor( Qt::WaitCursor) );
QString a = getAddrByName(name, AF_INET);
m_dialog->snmpIP->setText(a);
QApplication::restoreOverrideCursor();
getInterfacesBusy = false;
} catch (FWException &ex)
{
QMessageBox::warning(
this,"Firewall Builder",
tr("Address of %1 could not be obtained via DNS")
.arg(m_dialog->obj_name->text()),
"&Continue", QString::null, QString::null, 0, 1 );
getInterfacesBusy = false;
break ;
}
m_dialog->nextButton->setDefault(true);
break;
}

1
src/gui/newFirewallDialog.h
View File

@@ -106,6 +106,7 @@ public:
void showPage(const int page); //it was "selected(QString)"
bool validateAddressAndMask(const QString &addr,const QString &netm);
void getIPAddressOfFirewallByName();
public slots:
virtual void upInterface();

18
src/gui/newfirewalldialog_q.ui
View File

@@ -147,7 +147,7 @@
</size>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="page1">
<layout class="QGridLayout" name="gridLayout_4">
@@ -969,22 +969,6 @@ You can change interface names and their IP addresses on the next page. Templat
</hint>
</hints>
</connection>
<connection>
<sender>use_manual</sender>
<signal>toggled(bool)</signal>
<receiver>newFirewallDialog_q</receiver>
<slot>changed()</slot>
<hints>
<hint type="sourcelabel">
<x>70</x>
<y>79</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>use_snmp</sender>
<signal>toggled(bool)</signal>