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

adding comment to address range objects

Browse Source
This commit is contained in:
Vadim Kurland 2011-03-16 15:51:49 -07:00
parent 9585288e9c
commit 7cd22e0137
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/import/IPTImporter.cpp
View File

@ -423,8 +423,9 @@ FWObject* IPTImporter::makeSrcObj()
{
if (using_iprange_src)
{
return address_maker->createAddressRange(iprange_src_from.c_str(),
iprange_src_to.c_str());
return commitObject(
address_maker->createAddressRange(iprange_src_from.c_str(),
iprange_src_to.c_str()));
} else
return Importer::makeSrcObj();
}
@ -433,8 +434,9 @@ FWObject* IPTImporter::makeDstObj()
{
if (using_iprange_dst)
{
return address_maker->createAddressRange(iprange_dst_from.c_str(),
iprange_dst_to.c_str());
return commitObject(
address_maker->createAddressRange(iprange_dst_from.c_str(),
iprange_dst_to.c_str()));
} else
return Importer::makeDstObj();
}

7
src/import/serviceObjectMaker.cpp
View File

@ -237,12 +237,11 @@ FWObject* ServiceObjectMaker::getUDPService(int srs, int sre, int drs, int dre)
FWObject *obj = findMatchingObject(sig);
if (obj) return obj;
QStringList nl;
nl << QString("udp %1:%2 / %3:%4").arg(srs).arg(sre).arg(drs).arg(dre);
QString name = QString("udp %1:%2 / %3:%4")
.arg(srs).arg(sre).arg(drs).arg(dre);
UDPService* s = UDPService::cast(
createObject(UDPService::TYPENAME, nl.join("").toStdString()));
createObject(UDPService::TYPENAME, name.toStdString()));
s->setSrcRangeStart(srs);
s->setSrcRangeEnd(sre);
s->setDstRangeStart(drs);

6
src/unit_tests/ImporterTest/test_data/ipt.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="18" lastModified="1300306543" id="root">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="18" lastModified="1300315782" 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"/>
@ -463,8 +463,8 @@
<Network id="id30" name="net-222.222.222.0/24" comment="Created during import of line 266" ro="False" address="222.222.222.0" netmask="255.255.255.0"/>
</ObjectGroup>
<ObjectGroup id="id31" name="Address Ranges" comment="" ro="False">
<AddressRange id="id32" name="range-10.212.66.2-10.212.66.3" comment="" ro="False" start_address="10.212.66.2" end_address="10.212.66.3"/>
<AddressRange id="id33" name="range-192.11.1.11-192.11.1.63" comment="" ro="False" start_address="192.11.1.11" end_address="192.11.1.63"/>
<AddressRange id="id32" name="range-10.212.66.2-10.212.66.3" comment="Created during import of line 80" ro="False" start_address="10.212.66.2" end_address="10.212.66.3"/>
<AddressRange id="id33" name="range-192.11.1.11-192.11.1.63" comment="Created during import of line 80" ro="False" start_address="192.11.1.11" end_address="192.11.1.63"/>
<AddressRange id="id34" name="range-222.222.222.10-222.222.222.100" comment="Created during import of line 259" ro="False" start_address="222.222.222.10" end_address="222.222.222.100"/>
<AddressRange id="id35" name="range-192.168.1.1-192.168.1.10" comment="Created during import of line 261" ro="False" start_address="192.168.1.1" end_address="192.168.1.10"/>
</ObjectGroup>