diff --git a/src/import/IPTImporter.cpp b/src/import/IPTImporter.cpp index 554bb8261..f221bd84d 100644 --- a/src/import/IPTImporter.cpp +++ b/src/import/IPTImporter.cpp @@ -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(); } diff --git a/src/import/serviceObjectMaker.cpp b/src/import/serviceObjectMaker.cpp index 81da68e53..49bc1117c 100644 --- a/src/import/serviceObjectMaker.cpp +++ b/src/import/serviceObjectMaker.cpp @@ -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); diff --git a/src/unit_tests/ImporterTest/test_data/ipt.fwb b/src/unit_tests/ImporterTest/test_data/ipt.fwb index fa6adca66..db240db43 100644 --- a/src/unit_tests/ImporterTest/test_data/ipt.fwb +++ b/src/unit_tests/ImporterTest/test_data/ipt.fwb @@ -1,6 +1,6 @@ - + @@ -463,8 +463,8 @@ - - + +