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

see #2471 fixed tcp service object dduplication when they have non-blank tcp flags

Browse Source
This commit is contained in:
Vadim Kurland 2011-06-04 12:31:14 -07:00
parent 55730e6f01
commit ffee2090a7
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/import/PFImporter.cpp
View File

@ -453,6 +453,7 @@ void PFImporter::convertTcpFlags(QList<int> &flags_list,
"are not supported."));
}
}
qSort(flags_list);
}
FWObject* PFImporter::makeAddressObj(AddressSpec &as)

16
src/import/objectMaker.cpp
View File

@ -814,7 +814,7 @@ QString ObjectSignature::toString() const
type_name == ObjectGroup::TYPENAME)
sig << group_children_ids;
return sig.join("| |");
return sig.join("||");
}
void* ObjectSignature::dispatch(Network *obj, void*)
@ -935,6 +935,10 @@ void* ObjectSignature::dispatch(TCPService *obj, void*)
flags = obj->getAllTCPFlagMasks();
for (it=flags.begin(); it!=flags.end(); ++it) flags_mask << *it;
qSort(flags_comp);
qSort(flags_mask);
return this;
}
@ -1028,18 +1032,18 @@ void ObjectMaker::clear()
FWObject* ObjectMaker::findMatchingObject(const ObjectSignature &sig)
{
QString signature = sig.toString();
QString sig_str = sig.toString();
if ( ! sig.object_name.isEmpty())
{
if (named_object_registry.count(signature) > 0)
if (named_object_registry.count(sig_str) > 0)
return library->getRoot()->findInIndex(
named_object_registry[signature]);
named_object_registry[sig_str]);
return NULL;
}
if (anon_object_registry.count(signature) > 0)
return library->getRoot()->findInIndex(anon_object_registry[signature]);
if (anon_object_registry.count(sig_str) > 0)
return library->getRoot()->findInIndex(anon_object_registry[sig_str]);
return NULL;
}

3
src/import/serviceObjectMaker.cpp
View File

@ -83,8 +83,7 @@ FWObject* ServiceObjectMaker::createObject(ObjectSignature &sig)
FWObject *obj = findMatchingObject(sig);
// qDebug() << "Create object " << sig.toString()
// << " obj=" << obj;
// qDebug() << "Create object " << sig.toString() << " obj=" << obj;
if (obj) return obj;