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

see #2479 remove quotes from the file name spec

Browse Source
This commit is contained in:
Vadim Kurland 2011-06-05 23:08:17 -07:00
parent 2e1a499c18
commit b1f1eddc72
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/import/PFImporter.cpp
View File

@ -1245,7 +1245,11 @@ void PFImporter::newAddressTableObject(const string &name, const string &file)
ObjectSignature sig(error_tracker);
sig.type_name = AddressTable::TYPENAME;
sig.object_name = QString::fromUtf8(name.c_str());
sig.address_table_name = QString::fromUtf8(file.c_str());
QString filename = QString::fromUtf8(file.c_str());
filename.replace("\"", "");
sig.address_table_name = filename;
FWObject *at = address_maker->createObject(sig);
address_table_registry[sig.object_name] = at;

6
src/unit_tests/PFImporterTest/test_data/pf-tables.fwb
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="21" lastModified="1307169228" id="root">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="21" lastModified="1307340472" id="root">
<Library id="syslib000" color="#d4f8ff" name="Standard" comment="Standard objects" ro="True">
<AnyNetwork id="sysid0" name="Any" comment="Any Network" ro="False" address="0.0.0.0" netmask="0.0.0.0"/>
<AnyIPService id="sysid1" protocol_num="0" name="Any" comment="Any IP Service" ro="False"/>
@ -442,8 +442,8 @@
<ObjectGroup id="id8" name="Address Tables" comment="" ro="False">
<AddressTable id="id9" filename="" run_time="True" name="mike" comment="" ro="False"/>
<AddressTable id="id10" filename="" run_time="True" name="BLOCKTEMP" comment="" ro="False"/>
<AddressTable id="id11" filename="&quot;./pf_block_permanent&quot;" run_time="True" name="BLOCKPERM" comment="" ro="False"/>
<AddressTable id="id12" filename="&quot;./pf_table&quot;" run_time="True" name="BLOCK" comment="" ro="False"/>
<AddressTable id="id11" filename="./pf_block_permanent" run_time="True" name="BLOCKPERM" comment="" ro="False"/>
<AddressTable id="id12" filename="./pf_table" run_time="True" name="BLOCK" comment="" ro="False"/>
<AddressTable id="id13" filename="" run_time="True" name="spamd-white" comment="" ro="False"/>
</ObjectGroup>
<ObjectGroup id="id14" name="Groups" comment="" ro="False">

3
src/unit_tests/PFImporterTest/test_data/pf-tables.output
View File

@ -1,8 +1,11 @@
2: Address Table: <mike> file
3: Warning: attribute "counters" will be dropped from table configuration since this attribute is not supported at this time
3: Address Table: <BLOCKTEMP> file
4: Warning: attribute "counters" will be dropped from table configuration since this attribute is not supported at this time
4: Address Table: <BLOCKPERM> file "./pf_block_permanent"
5: Address Table: <BLOCK> file "./pf_table"
6: Address Table: <spamd-white> file
7: Warning: attribute "const" will be dropped from table configuration since this attribute is not supported at this time
7: Address Table: <private>: 10/8, 172.16/12, 192.168/16
9: Address Table: <dst_addresses_1>: 192.168.1.1/, 192.168.1.2/, 192.168.2.0/24
10: New interface: pcn0