Commit Graph
4195 Commits
Author SHA1 Message Date
Theron Tock 216dd1a2fb Make sure DEPENDPATH has same stuff as INCLUDEPATH, otherwise when files
change in other directories the dependent files don't get recompiled.

Fixed up INCLUDEPATH in various places.

Removed -pthread as an INCLUDEPATH (leads to bogus -I-pthread).
2011-05-11 14:05:18 -07:00
Vadim Kurland 40e08b70d1 added release notes 4.2.2 2011-05-11 14:02:03 -07:00
Vadim Kurland a2d64c733a set version to 4.2.2
see #2395, #2396  need to call fixTree() to fix pointers to the root of the tree after merge()
2011-05-11 09:53:11 -07:00
Vadim Kurland e706c96473 v 4.3.0.3541; merged from multiple_actions 2011-05-10 16:33:34 -07:00
Vadim Kurland 7ef3e583e5 see #2367 added test cases for options tag, classify and route and combinations - test object firewall111 2011-05-10 14:57:12 -07:00
Vadim Kurland ada42c100a see #2367 removed debugging in xslt script, set version to 4.3.0 2011-05-10 14:03:47 -07:00
Vadim Kurland c3bcd6a9ef see #2367 using correct path to the "platform" attribute of the firewall object; tested upgrade path 4.1.3 -> 4.2.1 -> 4.3.0 to make sure all rules get converted correctly 2011-05-10 13:57:21 -07:00
Vadim Kurland 38540cec7c merge from development 4.2.1.3540 2011-05-09 17:08:17 -07:00
Vadim Kurland ceb6904e06 build 3540 2011-05-09 11:47:09 -07:00
Vadim Kurland 4fde5344e9 fixes #2393 "broken link in the "Help / Firewall Builder Help" dialog"
build number 3540
2011-05-09 11:46:23 -07:00
Vadim Kurland 3b70160562 * FWCmdAddObject.cpp (redo): fixes #2391 "selecting 'new library'
when editor panel not on 'editor' tab causes crash"
2011-05-09 11:27:57 -07:00
Vadim Kurland 880cfb13fc * PolicyCompiler_pf_writers.cpp (_printQueue): see #2390 Classify
does not generate "queue" string for rules created in V4.2.1.3538
This completes the fix for the bug #2385.
2011-05-06 18:36:23 -07:00
Vadim Kurland 5a85c2d669 see #2367 ipfw actions queue,pipe and divert are terminating so we do not need to add permit to the generated command 2011-05-06 18:21:41 -07:00
Vadim Kurland 61929176e1 see #2367 no need to split iptables rules with option route because it is terminating by default; checking platform in xslt transformation to dtd21 to correctly set action 2011-05-06 18:11:52 -07:00
Vadim Kurland 7f2dbe58e9 See #2367 upgraded all test files to the latest dtd v21 2011-05-06 16:07:55 -07:00
Vadim Kurland b33cc80ad8 see #2367 rules with action Continue can be shadowed but can not shadow other rules 2011-05-06 16:07:17 -07:00
Vadim Kurland 1c5fbb98a5 fixed xslt script dtd20 -> dtd21 to handle pf_classify_terminating properly 2011-05-06 15:10:48 -07:00
Vadim Kurland 6fd2d6df2c updated unit test files to the latest DTD version 2011-05-05 22:26:44 -07:00
Vadim Kurland 25c887595a updated unit test files to the latest DTD version 2011-05-05 22:10:05 -07:00
Vadim Kurland 51774a5bf5 re-ran tests, checking in updated test files 2011-05-05 20:31:41 -07:00
Vadim Kurland 8773642198 see #2367 merge from development 2011-05-05 19:16:47 -07:00
Vadim Kurland 282102e03f Merge branch 'development' of ssh://vc.netcitadel.com:2222/var/git/fwbuilder into development 2011-05-05 18:50:59 -07:00
Vadim Kurland e24a73a560 see #2385 "PF action Classify uses
wrong parameter". This change fixes a bug introduced in 4.2.0
that affects rules with action Classify in PF firewalls.
2011-05-05 18:50:32 -07:00
Theron Tock 4880424bf3 Fixes #2387.
Check for null object in debug message so it doesn't cause crash.
2011-05-05 17:02:15 -07:00
Vadim Kurland 7232a2195b see #2385 bumped XML DTD version to 21 to make room for the transformation to fix bug #2385. That will be done in branch development 2011-05-05 12:01:18 -07:00
Vadim Kurland c096684c20 see #2367 merged latest changes from development branch; this merged transformation for v18->v19 XML file upgrades; upgraded test files for PF 2011-05-04 16:44:08 -07:00
Theron Tock 71f5faab3d Fixes #2379.
It seems Qt gives wrong value for "visible" arg in visibilityChanged on Mac.
So we use the isVisible() function instead.
2011-05-04 16:09:56 -07:00
Vadim Kurland afef4b39c1 bumped dtd version to 20 and renamed xslt upgrade script since dtd version increased to 19 in the development branch 2011-05-04 15:54:15 -07:00
Vadim Kurland d14a984f85 * FWObjectDatabase_18.xslt: XSLT transformation to upgrade data
files from DTD v18 to DTD v19. This transformation finds
"PolicyRule" elements with missing "Itf" child elements and fixes
them by adding such element with a reference pointint to "any".
Fixes #2383

* fwbuilder.dtd.in: Element "Itf" (an interface) of "PolicyRule"
should be required. DTD version increment.
2011-05-04 15:23:46 -07:00
Vadim Kurland 49e65c2775 see #2367 upgraded unit test files and made sure tests pass. Some chain names have changed after this change but overall script structure has improved. Still need to add more tests for various combinations of Classify, Tag and Route options with different actions 2011-05-03 20:43:38 -07:00
Vadim Kurland 48e32aef5d see #2367 fixed tag and negation combination for iptables; checking for broken tag configuration in rule set view 2011-05-03 16:32:48 -07:00
Vadim Kurland c2d3ac5bc5 see #2367 auto-upgrade transformation for DTD 19 2011-05-03 16:04:36 -07:00
Vadim Kurland 6da4d79543 see #2367 auto-upgrade transformation for DTD 19 2011-05-03 15:58:58 -07:00
Vadim Kurland a694b9a93d merged latest changes from development branch 2011-05-03 11:48:20 -07:00
Vadim Kurland cb09818f44 build 3536 2011-05-03 11:35:06 -07:00
Vadim Kurland 350c40030e * 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-05-03 11:28:13 -07:00
Vadim Kurland 13a897452d * PolicyCompiler_ipt.cpp (processNext): see #2367 "Multiple
actions per policy rule". Options "Tag", "Classify" and "Route"
work with iptables in a combination with any action. This
implementation has one restriction: option Route can not be used
in combination with options Tag or Classify and any action that is
not Continue. This is because option Route can yield rules in
PREROUTING or POSTROUTING chains that are also used by options Tag
and Classify. For this combination we create two user-defined
chains that perform routing and tagging (or classification). In
case of a terminating action both chains end with it. This means
if one matches the packet, the other is never going to see it.
Non-terminating action "Continue" does not create this problem.
This limitation may be removed in future versions of fwbuilder.
2011-05-03 10:30:55 -07:00
Vadim Kurland 542c4b5eeb Merge branch 'development' into multiple_actions 2011-05-02 20:49:45 -07:00
Vadim Kurland 64e860a025 see #2367 attempt at iptables support for tag, classify and route options 2011-05-02 18:50:03 -07:00
Theron Tock 75ea45a36b Fixes #2374.
Set the dock width to 0 if objectView is floated or hidden.
2011-05-02 15:45:46 -07:00
Vadim Kurland 3c276bc40b see #2367 using QComboBox to choose between "none", "queue" and "pipe" for ipfw classification 2011-05-02 14:34:34 -07:00
Vadim Kurland 7feb2f4731 show tag service object name in the Options column 2011-05-02 13:39:14 -07:00
Vadim Kurland 4e6b10cbc9 draw text line aligned with the icon in action and direction columns 2011-05-02 13:36:15 -07:00
Vadim Kurland dc5ebd940b see #2367 added support for action Continue for PF; tagging, classifictation and routing as options work for PF 2011-04-30 21:23:17 -07:00
Vadim Kurland 0845607d19 see #2367 when cell is selected, paint whole cell for action and direction just like it is done with options for consistency 2011-04-30 19:48:41 -07:00
Vadim Kurland b349745459 see #2367 drawing icons in the cell "Options" vertically; icons for tag, classification and routing are drawn with parameters 2011-04-30 19:45:22 -07:00
Vadim Kurland b2b656df5d Merge branch 'development' into multiple_actions 2011-04-30 18:55:30 -07:00
Vadim Kurland b9187f57ca see #2376 need to recalculate the size of the column "Options" 2011-04-30 18:55:11 -07:00
Vadim Kurland 2a83b756e7 updated dialog layout 2011-04-30 14:40:19 -07:00
Vadim Kurland 6b41cb4489 merged latest changes from development 2011-04-30 13:54:34 -07:00