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

speed up policy compile (changes in libfwbuilder:r499)

Browse Source
This commit is contained in:
Vadim Kurland 2009-12-24 22:22:22 +00:00
parent 988a5af694
commit ffe230a9c2
4 changed files with 7 additions and 6 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 2265
#define BUILD_NUM 2267

8
src/ipt/ipt.cpp
View File

@ -134,16 +134,16 @@ int main(int argc, char **argv)
/* load the data file */
UpgradePredicate upgrade_predicate;
cout << " *** Loading data ...";
cout << flush;
cerr << " *** Loading data ...";
cerr << flush;
objdb->setReadOnly( false );
objdb->load( filename, &upgrade_predicate, librespath);
objdb->setFileName(filename);
objdb->reIndex();
cout << " done\n";
cout << flush;
cerr << " done\n";
cerr << flush;
FWObject *slib = objdb->findInIndex(FWObjectDatabase::STANDARD_LIB_ID);
if (slib && slib->isReadOnly()) slib->setReadOnly(false);

1
src/iptlib/CompilerDriver_ipt_run.cpp
View File

@ -276,6 +276,7 @@ string CompilerDriver_ipt::run(const std::string &cluster_id,
{
Preprocessor* prep = new Preprocessor(
objdb , fw, ipv6_policy);
prep->setSingleRuleCompileMode(single_rule_id);
if (inTestMode()) prep->setTestMode();
if (inEmbeddedMode()) prep->setEmbeddedMode();
prep->compile();

2
test/ipt/objects-for-regression-tests.fwb
View File

@ -20268,7 +20268,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="verify_interfaces">False</Option>
</FirewallOptions>
</Firewall>
<Firewall id="id43867C1018346" host_OS="linux24" inactive="False" lastCompiled="1247364049" lastInstalled="1142003872" lastModified="1218856268" platform="iptables" version="" name="firewall33" comment="testing DNSName object" ro="False">
<Firewall id="id43867C1018346" host_OS="linux24" inactive="False" lastCompiled="1247364049" lastInstalled="1142003872" lastModified="1261688054" platform="iptables" version="" name="firewall33" comment="testing DNSName object" ro="False">
<NAT id="id43867C4818346" name="NAT" comment="" ro="False" ipv4_rule_set="False" ipv6_rule_set="False" top_rule_set="True">
<NATRule id="id43867C4918346" disabled="False" position="0" action="Translate" comment="">
<OSrc neg="False">