matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a prefix to combo protocol fields

Browse Source 
For same protocol numbers (e.g. IP 4o4), use Outer/Inner as prefix. For
"similar" protocols like VlanStack or IP 4o6, use the protocol name as
the prefix.
This commit is contained in:
Srivats P 2022-12-20 13:38:16 +05:30
parent f07cba39d5
commit d44fdf4ae7
1 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
common/comboprotocol.h
View File

@ -25,10 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
template <int protoNumber, class ProtoA, class ProtoB>
class ComboProtocol : public AbstractProtocol
{
protected:
ProtoA *protoA;
ProtoB *protoB;
public:
ComboProtocol(StreamBase *stream, AbstractProtocol *parent = 0)
: AbstractProtocol(stream, parent)
@ -40,6 +36,12 @@ public:
qDebug("%s: protoNumber = %d, %p <--> %p", __FUNCTION__,
protoNumber, protoA, protoB);
if (protoA->protocolNumber() == protoB->protocolNumber())
fieldPrefix = OuterInnerPrefix;
else if (similarProto())
fieldPrefix = ProtoNamePrefix;
}
virtual ~ComboProtocol()
@ -125,11 +127,29 @@ public:
int streamIndex = 0) const
{
int cnt = protoA->fieldCount();
QVariant value = index < cnt ?
protoA->fieldData(index, attrib, streamIndex) :
protoB->fieldData(index - cnt, attrib, streamIndex);
if (index < cnt)
return protoA->fieldData(index, attrib, streamIndex);
else
return protoB->fieldData(index - cnt, attrib, streamIndex);
if (attrib == FieldName) {
switch (fieldPrefix) {
case OuterInnerPrefix:
value = QString("%1 %2")
.arg(index < cnt ? QString("Outer") : QString("Inner"))
.arg(value.toString());
break;
case ProtoNamePrefix:
value = QString("%1 %2")
.arg(index < cnt ? protoA->shortName() : protoB->shortName())
.arg(value.toString());
break;
case NoPrefix:
// Fall-through
break;
}
}
return value;
}
virtual bool setFieldData(int index, const QVariant &value,
FieldAttrib attrib = FieldValue)
@ -186,6 +206,32 @@ public:
CksumType cksumType = CksumIp) const;
#endif
template <int protocolNumber, class FormA, class FormB, class ProtocolA, class ProtocolB> friend class ComboProtocolConfigForm;
protected:
ProtoA *protoA;
ProtoB *protoB;
private:
bool similarProto()
{
// TODO: Use Levenshtein distance or something similar with > 70% match
// For now we use an ugly hack!
if (protoA->shortName().contains("IPv")
&& protoB->shortName().contains("IPv"))
return true;
if (protoA->shortName().contains("Vlan")
&& protoB->shortName().contains("Vlan"))
return true;
return false;
}
enum FieldNamePrefix {
NoPrefix,
ProtoNamePrefix,
OuterInnerPrefix
};
FieldNamePrefix fieldPrefix{NoPrefix};
};
#endif