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

merged latest changes from development branch

Browse Source
This commit is contained in:
Vadim Kurland
2011-05-03 11:48:20 -07:00
parent 13a897452d cb09818f44
commit a694b9a93d
4 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/ChangeLog
+9
View File
@@ -14,6 +14,15 @@
Non-terminating action "Continue" does not create this problem.
This limitation may be removed in future versions of fwbuilder.
2011-05-03 vadim <vadim@netcitadel.com>
* newFirewallDialog.cpp (finishClicked): see #2380 "Firewall
object is created in the middle of the "new firewall" wizard and
clicking Back creates two firewall objects". If user chose to
create new firewall object from a template and clicked Back after
choosing the template, the program actually created two firewall
objects but only one was visible in the tree.
2011-04-30 vadim <vadim@netcitadel.com>
* RuleSetModel.cpp (objectChanged): see #2373 "GUI becomes
src/libgui/newFirewallDialog.cpp
+31 -18
View File
@@ -2,12 +2,10 @@
Firewall Builder
Copyright (C) 2003 NetCitadel, LLC
Copyright (C) 2003-2011 NetCitadel, LLC
Author: Vadim Kurland vadim@fwbuilder.org
$Id$
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
@@ -39,6 +37,7 @@
#include "FWBApplication.h"
#include "QDesktopWidget"
#include "networkZoneManager.h"
#include "ObjConflictResolutionDialog.h"
#include "interfaceProperties.h"
#include "interfacePropertiesObjectFactory.h"
@@ -96,7 +95,9 @@ newFirewallDialog::newFirewallDialog(QWidget *parentw, FWObject *_p) :
QDialog(parentw)
{
parent = _p;
db = parent->getRoot();
db_orig = parent->getRoot();
db_copy = new FWObjectDatabase();
db_copy->duplicate(db_orig, false);
m_dialog = new Ui::newFirewallDialog_q;
m_dialog->setupUi(this);
@@ -250,6 +251,7 @@ newFirewallDialog::~newFirewallDialog()
#ifdef HAVE_LIBSNMP
if (q!=NULL) delete q;
#endif
delete db_copy;
}
void newFirewallDialog::changed()
@@ -647,7 +649,8 @@ void newFirewallDialog::showPage(const int page)
// Show firewall templates
setFinishEnabled( CHOOSE_FW_TEMPLATE, false );
setNextEnabled( CHOOSE_FW_TEMPLATE, true );
/* load templates if not loaded */
// load templates if not loaded
if (tmpldb==NULL)
{
@@ -671,6 +674,17 @@ void newFirewallDialog::showPage(const int page)
}
}
// nfw != NULL if user clicked Back on one of the subsequent
// pages because we create firewall object when they click
// Next on the page where they choose template ( see case
// CONFIGURE_TEMPLATE_INTERFACES_MANUALLY below)
if (nfw)
{
parent->remove(nfw, false);
delete nfw;
nfw = NULL;
}
list<FWObject*> fl;
FWObjectTypedChildIterator libiter = tmpldb->findByType(Library::TYPENAME);
@@ -734,14 +748,7 @@ void newFirewallDialog::showPage(const int page)
// Edit interfaces of the template object
createFirewallFromTemplate();
setFinishEnabled( CONFIGURE_TEMPLATE_INTERFACES_MANUALLY, true );
/*
this->m_dialog->interfaceEditor2->setExplanation(
tr("Here you can change IP address of the template interface "
"to match addresses used on your network. "
"Interface can have several IPv4 and "
"IPv6 addresses.")
);
*/
this->m_dialog->interfaceEditor2->clear();
this->m_dialog->interfaceEditor2->closeTab();//->removeTab(0);
this->m_dialog->interfaceEditor2->setCornerWidgetsVisible(false);
@@ -872,7 +879,7 @@ void newFirewallDialog::fillInterfaceNZList()
m_dialog->iface_nz_list->setHorizontalHeaderLabels(labels);
NetworkZoneManager netzone_manager;
netzone_manager.load(db);
netzone_manager.load(db_copy);
int row = 0;
foreach(EditedInterfaceData iface,
@@ -1122,7 +1129,7 @@ void newFirewallDialog::finishClicked()
return;
FWObject *o;
o = db->create(Firewall::TYPENAME);
o = db_copy->create(Firewall::TYPENAME);
if (o==NULL)
{
@@ -1189,7 +1196,7 @@ void newFirewallDialog::finishClicked()
network_zone_str_id = "";
}
Interface *oi = Interface::cast(db->create(Interface::TYPENAME));
Interface *oi = Interface::cast(db_copy->create(Interface::TYPENAME));
assert(oi!=NULL);
nfw->add(oi);
@@ -1227,7 +1234,7 @@ void newFirewallDialog::finishClicked()
if (address.ipv4)
{
string addrname = string( QString("%1:%2:ip").arg(QString(m_dialog->obj_name->text())).arg(name).toUtf8().constData() );
IPv4 *oa = IPv4::cast(db->create(IPv4::TYPENAME));
IPv4 *oa = IPv4::cast(db_copy->create(IPv4::TYPENAME));
oi->add(oa);
oa->setName(addrname);
oa->setAddress( InetAddr(address.address.toLatin1().constData()) );
@@ -1245,7 +1252,7 @@ void newFirewallDialog::finishClicked()
else
{
string addrname = string ( QString("%1:%2:ip6").arg(QString(m_dialog->obj_name->text())).arg(name).toUtf8().constData() );
IPv6 *oa = IPv6::cast(db->create(IPv6::TYPENAME));
IPv6 *oa = IPv6::cast(db_copy->create(IPv6::TYPENAME));
oi->add(oa);
oa->setName(addrname);
oa->setAddress(InetAddr(AF_INET6, address.address.toLatin1().constData()) );
@@ -1265,6 +1272,12 @@ void newFirewallDialog::finishClicked()
}
}
// merge dbcopy into db
CompareObjectsDialog cod(this);
db_orig->merge(db_copy, &cod);
if (tmpldb!=NULL)
{
delete tmpldb;
src/libgui/newFirewallDialog.h
+2 -1
View File
@@ -63,8 +63,9 @@ class newFirewallDialog : public QDialog, public FakeWizard
libfwbuilder::Logger *logger;
libfwbuilder::SNMPQuery *q;
QTimer *timer;
libfwbuilder::FWObjectDatabase *db;
libfwbuilder::FWObjectDatabase *db_orig;
libfwbuilder::FWObjectDatabase *tmpldb;
libfwbuilder::FWObjectDatabase *db_copy;
libfwbuilder::FWObject *parent;
std::map<QListWidgetItem*, libfwbuilder::FWObject*> templates;
bool unloadTemplatesLib;
src/libgui/newFirewallDialog_from_template.cpp
+5 -5
View File
@@ -85,7 +85,7 @@ void newFirewallDialog::createFirewallFromTemplate()
string host_os = readHostOS(m_dialog->hostOS).toAscii().constData();
map<int, int> map_ids;
FWObject *no = db->recursivelyCopySubtree(parent, template_fw, map_ids);
FWObject *no = db_copy->recursivelyCopySubtree(parent, template_fw, map_ids);
no->setName( string( m_dialog->obj_name->text().toUtf8().constData() ) );
@@ -267,7 +267,7 @@ Address* newFirewallDialog::replaceInterfaceAddressData(Firewall *fw,
if (addr_obj) oa = addr_obj;
else
{
oa = IPv4::cast(db->create(IPv4::TYPENAME));
oa = IPv4::cast(db_copy->create(IPv4::TYPENAME));
intf->add(oa);
}
name = QString("%1:%2:ipv4")
@@ -285,7 +285,7 @@ Address* newFirewallDialog::replaceInterfaceAddressData(Firewall *fw,
if (addr_obj) oa = addr_obj;
else
{
oa = IPv6::cast(db->create(IPv6::TYPENAME));
oa = IPv6::cast(db_copy->create(IPv6::TYPENAME));
intf->add(oa);
}
name = QString("%1:%2:ipv6")
@@ -329,7 +329,7 @@ void newFirewallDialog::replaceReferencesToNetworks(Firewall *fw,
FWObject *parent =
FWBTree().getStandardSlotForObject(
current_lib, net_type.c_str());
Address *new_net_obj = Address::cast(db->create(net_type));
Address *new_net_obj = Address::cast(db_copy->create(net_type));
parent->add(new_net_obj);
QString new_net_name =
QString("%1:%2:net").arg(fw->getName().c_str()).arg(intf->getName().c_str());
@@ -357,6 +357,6 @@ void newFirewallDialog::replaceReferencesToObject(Firewall*,
{
map<int, int> map_ids;
map_ids[old_obj->getId()] = new_obj->getId();
db->fixReferences(db, map_ids);
db_copy->fixReferences(db_copy, map_ids);
}