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

fixed bug 1961202 (porting from 2.1.19)

Browse Source
This commit is contained in:
Vadim Kurland
2008-05-10 20:46:44 +00:00
parent 4621d9bcc4
commit 9817848911
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2008-05-10 vadim <vadim@vk.crocodile.org>
* 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 <vadim@vk.crocodile.org> 2008-05-08 vadim <vadim@vk.crocodile.org>
* FWWindowPrint.cpp (printFirewall): (from 2.1): fixed bug * FWWindowPrint.cpp (printFirewall): (from 2.1): fixed bug
src/pf/pf.cpp
+5 -6
View File
@@ -519,6 +519,11 @@ int main(int argc, char * const *argv)
options->getStr("pf_limit_table_entries")); options->getStr("pf_limit_table_entries"));
if (limits.size() > 0) if (limits.size() > 0)
if ( ! options->getStr("pf_optimization").empty() )
pf_file << "set optimization "
<< options->getStr("pf_optimization") << endl;
{ {
pf_file << "set limit "; pf_file << "set limit ";
if (limits.size() > 1 ) pf_file << "{ "; if (limits.size() > 1 ) pf_file << "{ ";
@@ -586,12 +591,6 @@ int main(int argc, char * const *argv)
"pf_set_adaptive","pf_adaptive_end", "pf_set_adaptive","pf_adaptive_end",
"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' // check if any interface is marked as 'unprotected'
// and generate 'set skip on <ifspec>' commands // and generate 'set skip on <ifspec>' commands
test/pf/objects-for-regression-tests.fwb
+8 -8
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd"> <!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="5" lastModified="1210047001" id="root"> <FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="5" lastModified="1210452317" id="root">
<Library color="#d2ffd0" comment="User defined objects" id="syslib001" name="User" ro="False"> <Library color="#d2ffd0" comment="User defined objects" id="syslib001" name="User" ro="False">
<ObjectGroup id="stdid01_1" name="Objects"> <ObjectGroup id="stdid01_1" name="Objects">
<ObjectGroup id="stdid01_1_og_ats_1" name="Address Tables"> <ObjectGroup id="stdid01_1_og_ats_1" name="Address Tables">
@@ -2244,7 +2244,7 @@
<Option name="use_tables">True</Option> <Option name="use_tables">True</Option>
</FirewallOptions> </FirewallOptions>
</Firewall> </Firewall>
<Firewall comment="this object has several interfaces and shows different rules for NAT. Also testing policy rule options " host_OS="openbsd" id="id3AFB66C6" inactive="False" lastCompiled="1157930805" lastInstalled="0" lastModified="1200415283" name="firewall2" platform="pf" ro="False" version=""> <Firewall comment="this object has several interfaces and shows different rules for NAT. Also testing policy rule options " host_OS="openbsd" id="id3AFB66C6" inactive="False" lastCompiled="1157930805" lastInstalled="0" lastModified="1210452316" name="firewall2" platform="pf" ro="False" version="">
<NAT id="id3AFB66C7" name="NAT"> <NAT id="id3AFB66C7" name="NAT">
<NATRule disabled="False" id="id3AFB66C8" position="0"> <NATRule disabled="False" id="id3AFB66C8" position="0">
<OSrc neg="False"> <OSrc neg="False">
@@ -3312,19 +3312,19 @@
<Option name="pf_set_other_single">False</Option> <Option name="pf_set_other_single">False</Option>
<Option name="pf_set_tcp_closed">False</Option> <Option name="pf_set_tcp_closed">False</Option>
<Option name="pf_set_tcp_closing">False</Option> <Option name="pf_set_tcp_closing">False</Option>
<Option name="pf_set_tcp_established">False</Option> <Option name="pf_set_tcp_established">True</Option>
<Option name="pf_set_tcp_finwait">False</Option> <Option name="pf_set_tcp_finwait">False</Option>
<Option name="pf_set_tcp_first">False</Option> <Option name="pf_set_tcp_first">True</Option>
<Option name="pf_set_tcp_opening">False</Option> <Option name="pf_set_tcp_opening">True</Option>
<Option name="pf_set_udp_first">False</Option> <Option name="pf_set_udp_first">False</Option>
<Option name="pf_set_udp_multiple">False</Option> <Option name="pf_set_udp_multiple">False</Option>
<Option name="pf_set_udp_single">False</Option> <Option name="pf_set_udp_single">False</Option>
<Option name="pf_tcp_closed">0</Option> <Option name="pf_tcp_closed">0</Option>
<Option name="pf_tcp_closing">0</Option> <Option name="pf_tcp_closing">0</Option>
<Option name="pf_tcp_established">0</Option> <Option name="pf_tcp_established">10</Option>
<Option name="pf_tcp_finwait">0</Option> <Option name="pf_tcp_finwait">0</Option>
<Option name="pf_tcp_first">0</Option> <Option name="pf_tcp_first">5</Option>
<Option name="pf_tcp_opening">0</Option> <Option name="pf_tcp_opening">5</Option>
<Option name="pf_timeout_frag">30</Option> <Option name="pf_timeout_frag">30</Option>
<Option name="pf_timeout_interval">10</Option> <Option name="pf_timeout_interval">10</Option>
<Option name="pf_udp_first">0</Option> <Option name="pf_udp_first">0</Option>