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

merge from v3

Browse Source
This commit is contained in:
Vadim Kurland
2009-06-02 17:50:30 +00:00
parent 161a6cc0e3 1c0c8b2010
commit 532209d501
4 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 986
#define BUILD_NUM 991
doc/ChangeLog
+16
View File
@@ -1,5 +1,21 @@
2009-06-01 vadim <vadim@vk.crocodile.org>
* newHostDialog.cpp (newHostDialog::selectedInterface): fixed the
same error reported in bug #2799163: "crash on correcting an
error". The GUI crashed if user tried to add, then delete
interfaces in the new firewall wizard. The crash occurred when the
last interface was deleted on the page where interfaces can be
configured manually. This needed to be fixed in both "new
firewall" and "new host" dialogs.
2009-05-31 vadim <vadim@vk.crocodile.org>
* FindObjectWidget.cpp (FindObjectWidget::findNext): fixed bug
#2799315 "Find object" cant find object in rules of opened
firewall. If scope was set to "policy of the opened firewall",
"Find object" function could not find anything. It worked when
scope was set to "policy of all firewalls".
* RuleSetView.cpp (RuleSetView::contextMenu): fixed bug #2799254
"Erratic behavior when rule is removed from the group". If user
tried to remove a rule from the middle of a group of rules, the
src/gui/FindObjectWidget.cpp
+32 -12
View File
@@ -38,7 +38,7 @@
#include "ObjectTreeView.h"
#include "RuleSetView.h"
#include "ObjectEditor.h"
#include "ProjectPanel.h"
#include "fwbuilder/FWObjectDatabase.h"
#include "fwbuilder/FWReference.h"
@@ -76,8 +76,10 @@ FindObjectWidget::FindObjectWidget(QWidget*p, const char * n, Qt::WindowFlags f)
setObjectName(n);
replaceDisable();
m_widget->srScope->setCurrentIndex(st->getInt(SETTINGS_PATH_PREFIX"/Search/Scope"));
m_widget->srScope->setCurrentIndex(
st->getInt(SETTINGS_PATH_PREFIX"/Search/Scope"));
}
void FindObjectWidget::findObject(FWObject *o)
{
if (fwbdebug) qDebug("FindObjectWidget::findObject");
@@ -117,12 +119,11 @@ void FindObjectWidget::objectInserted()
reset();
}
void FindObjectWidget::reset()
{
lastFound=NULL;
lastAttrSearch="";
treeSeeker=mw->db()->tree_begin();
treeSeeker = mw->db()->tree_begin();
}
@@ -142,7 +143,7 @@ void FindObjectWidget::find()
if (m_widget->findAttr->count()>=MAX_SEARCH_ITEMS_COUNT)
m_widget->findAttr->removeItem(MAX_SEARCH_ITEMS_COUNT-1);
m_widget->findAttr->insertItem( 0, m_widget->findAttr->lineEdit()->text() );
m_widget->findAttr->insertItem(0, m_widget->findAttr->lineEdit()->text());
if (fwbdebug)
qDebug("FindObjectWidget::find() : m_widget->findAttr->text(0)=%s",
@@ -179,6 +180,7 @@ bool FindObjectWidget::matchAttr(libfwbuilder::FWObject *obj)
break;
}
case 1: // Address
{
Address *a = Address::cast(obj);
@@ -198,6 +200,7 @@ bool FindObjectWidget::matchAttr(libfwbuilder::FWObject *obj)
}
break;
}
case 2: // port
if (TCPService::cast(obj)!=NULL || UDPService::cast(obj)!=NULL)
{
@@ -228,6 +231,7 @@ bool FindObjectWidget::matchAttr(libfwbuilder::FWObject *obj)
break;
}
break;
case 3: // protocol num.
if (IPService::cast(obj)!=NULL)
{
@@ -245,6 +249,7 @@ bool FindObjectWidget::matchAttr(libfwbuilder::FWObject *obj)
break;
}
break;
case 4: // icmp type
if (ICMPService::cast(obj)!=NULL)
{
@@ -277,7 +282,18 @@ void FindObjectWidget::findNext()
if (m_widget->findAttr->count()>MAX_SEARCH_ITEMS_COUNT)
m_widget->findAttr->removeItem(0);
FWObject *o=NULL;
FWObject *o = NULL;
// if scope is "policies of opened firewall" then we need to get
// pointer to the currently opened firewall object
RuleSet* current_rule_set = mw->activeProject()->getCurrentRuleSet();
if (current_rule_set)
selectedFirewall = Firewall::cast(current_rule_set->getParent());
else
selectedFirewall = NULL;
if (fwbdebug)
qDebug("selectedFirewall: %p", selectedFirewall);
loop:
@@ -287,6 +303,9 @@ loop:
{
o = *treeSeeker;
// if (fwbdebug)
// qDebug("Found object %s (%s)", o->getName().c_str(), o->getTypeName().c_str());
if( RuleElement::cast(o->getParent())!=NULL)
{
if (m_widget->srScope->currentIndex()==3) // scope == selected firewalls
@@ -296,7 +315,8 @@ loop:
continue;
}
} else if (m_widget->srScope->currentIndex()==0) continue ; // scope == tree only
} else
if (m_widget->srScope->currentIndex()==0) continue ; // scope == tree only
} else
{
/* if not in rules, then in the tree. */
@@ -526,7 +546,6 @@ FWObject* FindObjectWidget::_replaceCurrent()
}
bool FindObjectWidget::inSelectedFirewall( RuleElement* r)
{
FWObject *f=r;
while (f!=NULL && !Firewall::isA(f)) f=f->getParent();
if (f==NULL) return false;
@@ -589,8 +608,9 @@ void FindObjectWidget::init()
void FindObjectWidget::firewallOpened(Firewall *f)
{
if (f==NULL) return;
selectedFirewall=f;
m_widget->srScope->setItemText( 3, tr("Policy of firewall '")+f->getName().c_str()+"'" );
selectedFirewall = f;
m_widget->srScope->setItemText(
3, tr("Policy of firewall '")+f->getName().c_str()+"'" );
}
void FindObjectWidget::findPrev()
@@ -605,6 +625,6 @@ void FindObjectWidget::replaceNext()
}
void FindObjectWidget::scopeChanged()
{
st->setValue(SETTINGS_PATH_PREFIX"/Search/Scope",m_widget->srScope->currentIndex ());
st->setValue(SETTINGS_PATH_PREFIX"/Search/Scope",
m_widget->srScope->currentIndex ());
}
src/gui/newHostDialog.cpp
+10 -7
View File
@@ -596,13 +596,16 @@ void newHostDialog::selectedInterface(QTreeWidgetItem*cur,QTreeWidgetItem*)
//void newHostDialog::selectedInterface(QTreeWidgetItem *cur)
{
QTreeWidgetItem *itm = cur;
m_dialog->iface_name->setText( itm->text(0) );
m_dialog->iface_label->setText( itm->text(1) );
m_dialog->iface_addr->setText( itm->text(2) );
m_dialog->iface_netmask->setText( itm->text(3) );
m_dialog->iface_dyn->setChecked( itm->text(4).indexOf("Dyn")!=-1 );
m_dialog->iface_unnum->setChecked( itm->text(4).indexOf("Unn")!=-1 );
m_dialog->iface_physaddr->setText( itm->text(5) );
if (itm)
{
m_dialog->iface_name->setText( itm->text(0) );
m_dialog->iface_label->setText( itm->text(1) );
m_dialog->iface_addr->setText( itm->text(2) );
m_dialog->iface_netmask->setText( itm->text(3) );
m_dialog->iface_dyn->setChecked( itm->text(4).indexOf("Dyn")!=-1 );
m_dialog->iface_unnum->setChecked( itm->text(4).indexOf("Unn")!=-1 );
m_dialog->iface_physaddr->setText( itm->text(5) );
}
}
void newHostDialog::updateInterface()