From 9817848911b0d4d2d15b00cbea46fb2bab880736 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Sat, 10 May 2008 20:46:44 +0000 Subject: [PATCH] fixed bug 1961202 (porting from 2.1.19) --- doc/ChangeLog | 6 ++++++ src/pf/pf.cpp | 11 +++++------ test/pf/objects-for-regression-tests.fwb | 16 ++++++++-------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index d41dce1df..1e296e1e6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2008-05-10 vadim + + * pf.cpp: (from 2.1) fixed bug #1961202: "Pf Timeouts overriden by + Optimization". Compiler should generate "set optimization" command + before "set timeout" commands. + 2008-05-08 vadim * FWWindowPrint.cpp (printFirewall): (from 2.1): fixed bug diff --git a/src/pf/pf.cpp b/src/pf/pf.cpp index 2eb706b81..7f7921042 100644 --- a/src/pf/pf.cpp +++ b/src/pf/pf.cpp @@ -519,6 +519,11 @@ int main(int argc, char * const *argv) options->getStr("pf_limit_table_entries")); if (limits.size() > 0) + + if ( ! options->getStr("pf_optimization").empty() ) + pf_file << "set optimization " + << options->getStr("pf_optimization") << endl; + { pf_file << "set limit "; if (limits.size() > 1 ) pf_file << "{ "; @@ -586,12 +591,6 @@ int main(int argc, char * const *argv) "pf_set_adaptive","pf_adaptive_end", "adaptive.end"); - - - if ( ! options->getStr("pf_optimization").empty() ) - pf_file << "set optimization " - << options->getStr("pf_optimization") << endl; - // check if any interface is marked as 'unprotected' // and generate 'set skip on ' commands diff --git a/test/pf/objects-for-regression-tests.fwb b/test/pf/objects-for-regression-tests.fwb index 1f7355d3c..4a2192604 100644 --- a/test/pf/objects-for-regression-tests.fwb +++ b/test/pf/objects-for-regression-tests.fwb @@ -1,6 +1,6 @@ - + @@ -2244,7 +2244,7 @@ - + @@ -3312,19 +3312,19 @@ - + - - + + - + - - + +