onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-24 04:07:55 +01:00
Code Issues Releases Wiki Activity

2009-04-29 Vadim Kurland <vadim@vk.crocodile.org>

Browse Source 
* RoutingCompiler_pix.cpp (RoutingCompiler_pix::prolog): fixes bug
	#2782645: "Can't compile for FWSM platform". Routing compiler for
	PIX should accept firewall object with platform "fwsm" as well as
	"pix".

	* ObjectManipulator.cpp (ObjectManipulator::actuallyCreateObject):
	fixes bug #2783780: "Tree objects not sorted in
	3.0.4". Automatically re-sort object branch when new host or
	firewall object is created so that the new object is positioned in
	the alphabetic sorting order.
This commit is contained in:
Vadim Kurland 2009-04-29 19:24:43 +00:00
parent 987be3d466
commit d65440d258
5 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 826
#define BUILD_NUM 839

13
doc/ChangeLog
View File

@ -1,3 +1,16 @@
2009-04-29 Vadim Kurland <vadim@vk.crocodile.org>
* RoutingCompiler_pix.cpp (RoutingCompiler_pix::prolog): fixes bug
#2782645: "Can't compile for FWSM platform". Routing compiler for
PIX should accept firewall object with platform "fwsm" as well as
"pix".
* ObjectManipulator.cpp (ObjectManipulator::actuallyCreateObject):
fixes bug #2783780: "Tree objects not sorted in
3.0.4". Automatically re-sort object branch when new host or
firewall object is created so that the new object is positioned in
the alphabetic sorting order.
2009-04-27 vadim <vadim@vk.crocodile.org>
* ObjectManipulator.cpp (ObjectManipulator::getMenuState): for bug

24
qmake.inc
View File

@ -11,15 +11,15 @@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@
DEFINES += $$(DEFINES)
LANGUAGE = C++
UI_DIR = ui
MANDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/man/
DOCDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5
MANDIR = /private/var/tmp/src/fwb3-branch-v3/install_root/share/man/
DOCDIR = /private/var/tmp/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5
HAVE_ANTLR_RUNTIME = 1
HAVE_EXTERNAL_ANTLR = 0
unix {
ANTLR_INCLUDEPATH = /Users/vadim/src/fwbuilder/fwb3-branch-v3/source/fwbuilder/src/
ANTLR_LIBS = /Users/vadim/src/fwbuilder/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a
ANTLR_INCLUDEPATH = /private/var/tmp/src/fwb3-branch-v3/source/fwbuilder/src/
ANTLR_LIBS = /private/var/tmp/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a
FWBPARSER_LIB = ../parsers/libfwbparser.a
}
@ -30,21 +30,21 @@ unix {
MOC_DIR = .moc
OBJECTS_DIR = .obj
PREFIX = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root
PREFIX = /private/var/tmp/src/fwb3-branch-v3/install_root
exec_prefix = @EXEC_PREFIX@
DESTDIR =
ICONSDIR =
INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /private/var/tmp/src/fwb3-branch-v3/install_root/include/ /private/var/tmp/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
LIBS_FWCOMPILER = -L/Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
LIBS_FWBUILDER = -L/Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
LIBS_FWCOMPILER = -L/private/var/tmp/src/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
LIBS_FWBUILDER = -L/private/var/tmp/src/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
target.path = $$PREFIX/bin
dtd.path = @TEMPLATE_DIR@/
migration.path = @TEMPLATE_DIR@/migration
doc.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5
datadir.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/
doc.path = /private/var/tmp/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.5
datadir.path = /private/var/tmp/src/fwb3-branch-v3/install_root/share/
# win32:target.path = $$PREFIX/
@ -55,7 +55,7 @@ unix {
res_os.path = ../Resources/os/
res_platform.path = ../Resources/platform/
res_help.path = ../Resources/help/
res_desktop.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share//applications/
res_desktop.path = /private/var/tmp/src/fwb3-branch-v3/install_root/share//applications/
INSTALLS += res
INSTALLS += res_os
@ -74,7 +74,7 @@ unix {
}
macx {
PREFIX = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root
PREFIX = /private/var/tmp/src/fwb3-branch-v3/install_root
}
win32 {

14
src/gui/ObjectManipulator.cpp
View File

@ -864,7 +864,7 @@ void ObjectManipulator::addTreePage( FWObject *lib)
insertSubtree( itm1, (*m) );
objTreeView->updateTreeItems();
objTreeView->sortByColumn(0,Qt::AscendingOrder);
objTreeView->sortByColumn(0, Qt::AscendingOrder);
}
void ObjectManipulator::removeLib(FWObject* lib)
@ -2689,8 +2689,7 @@ FWObject* ObjectManipulator::createObject(FWObject *parent,
if (parent==NULL) parent=lib;
return actuallyCreateObject(parent,objType,objName,copyFrom);
return actuallyCreateObject(parent, objType, objName, copyFrom);
}
FWObject* ObjectManipulator::actuallyCreateObject(FWObject *parent,
@ -2714,6 +2713,8 @@ FWObject* ObjectManipulator::actuallyCreateObject(FWObject *parent,
parent->getName().c_str(), parent_item);
insertSubtree(parent_item, nobj);
parent_item->sortChildren(0, Qt::AscendingOrder);
m_project->db()->setDirty(true);
mw->reloadAllWindowsWithFile(m_project);
return nobj;
@ -2750,8 +2751,7 @@ void ObjectManipulator::newPolicyRuleSet ()
openObject(o);
editObject(o);
}
this->getCurrentObjectTree()->sortItems(0,Qt::AscendingOrder);
this->getCurrentObjectTree()->sortItems(0, Qt::AscendingOrder);
}
void ObjectManipulator::newNATRuleSet ()
@ -2777,7 +2777,7 @@ void ObjectManipulator::newNATRuleSet ()
openObject(o);
editObject(o);
}
this->getCurrentObjectTree()->sortItems(0,Qt::AscendingOrder);
this->getCurrentObjectTree()->sortItems(0, Qt::AscendingOrder);
}
@ -2799,7 +2799,7 @@ void ObjectManipulator::newFirewall()
void ObjectManipulator::newHost()
{
newHostDialog *nhd=new newHostDialog();
newHostDialog *nhd = new newHostDialog();
if (m_project->isEditorVisible()) m_project->hideEditor();
nhd->exec();
FWObject *o = nhd->getNewHost();

6
src/pix/RoutingCompiler_pix.cpp
View File

@ -50,9 +50,9 @@ string RoutingCompiler_pix::myPlatformName() { return "pix"; }
int RoutingCompiler_pix::prolog()
{
int n = RoutingCompiler_cisco::prolog();
if (fw->getStr("platform")!="pix")
abort("Unsupported platform " + fw->getStr("platform") );
string platform = fw->getStr("platform");
if (platform!="pix" && platform!="fwsm")
abort("Unsupported platform " + platform );
return n;
}