17792b8253
--------------------------------- - StreamConfigDialog: Valid subsequent protocol choices for a particular protocol in the simple protocol selection widget is no longer hardcoded - ProtocolManager is queried for validitity of each pair of possible protocols; signal-slot connections are made accordingly. This refactoring makes it easier to add a protocol to the simple protocol selection widget - ProtocolManager: populates and maintains a database of valid 'neighbour protocols' and implements a method - isValidNeighbour() to query the same for a pair of protocols - AbstractProtocol: new method protocolIdType() introduced to build the above database (in conjunction with the existing method protocolId(ProtocolIdType)); default implementation returns ProtocolIdNone - Protocols which include a valid/supported ProtocolIdType (eth/llc/ip) reimplement protocolIdType() to return the apporpirate ProtocolIdType. These are viz. - combo - eth - llc - snap - ip - Speed optimization while populating streamqueues if the protocolFrameValue/Size() does not vary across packets - AbstractProtocol: new methods to support the above optimization - isProtocolFrameValueVariable() - isProtocolFrameSizeVariable() - isProtocolFramePayloadValueVariable() - isProtocolFramePayloadSizeVariable() (each of the default implementations returns false indicating that the protocol frame value or frame size is fixed and not variable) - Protocols which support variable values/size (list follows) reimplement the above methods appropriately - combo - mac - dot3 - ip4 - tcp - udp - payload - StreamInfo::makePacket() moved to base class as StreamBase::frameValue() - StreamBase: all 'get' accessor functions made 'const' - class ProtocolManager: while registering a protocol, no need to pass the protocol name; ProtocolManager finds it out internally by using the protocol's shortName() method Fixes ----- - Fixed issue with port capture not starting the first time 'start capture' was clicked
154 lines
2.8 KiB
C++
154 lines
2.8 KiB
C++
#include <qendian.h>
|
|
#include <QHostAddress>
|
|
|
|
#include "eth2.h"
|
|
|
|
Eth2ConfigForm::Eth2ConfigForm(QWidget *parent)
|
|
: QWidget(parent)
|
|
{
|
|
setupUi(this);
|
|
}
|
|
|
|
Eth2Protocol::Eth2Protocol(StreamBase *stream, AbstractProtocol *parent)
|
|
: AbstractProtocol(stream, parent)
|
|
{
|
|
configForm = NULL;
|
|
}
|
|
|
|
Eth2Protocol::~Eth2Protocol()
|
|
{
|
|
delete configForm;
|
|
}
|
|
|
|
AbstractProtocol* Eth2Protocol::createInstance(StreamBase *stream,
|
|
AbstractProtocol *parent)
|
|
{
|
|
return new Eth2Protocol(stream, parent);
|
|
}
|
|
|
|
quint32 Eth2Protocol::protocolNumber() const
|
|
{
|
|
return OstProto::Protocol::kEth2FieldNumber;
|
|
}
|
|
|
|
void Eth2Protocol::protoDataCopyInto(OstProto::Protocol &protocol) const
|
|
{
|
|
protocol.MutableExtension(OstProto::eth2)->CopyFrom(data);
|
|
protocol.mutable_protocol_id()->set_id(protocolNumber());
|
|
}
|
|
|
|
void Eth2Protocol::protoDataCopyFrom(const OstProto::Protocol &protocol)
|
|
{
|
|
if (protocol.protocol_id().id() == protocolNumber() &&
|
|
protocol.HasExtension(OstProto::eth2))
|
|
data.MergeFrom(protocol.GetExtension(OstProto::eth2));
|
|
}
|
|
|
|
QString Eth2Protocol::name() const
|
|
{
|
|
return QString("Ethernet II");
|
|
}
|
|
|
|
QString Eth2Protocol::shortName() const
|
|
{
|
|
return QString("Eth II");
|
|
}
|
|
|
|
AbstractProtocol::ProtocolIdType Eth2Protocol::protocolIdType() const
|
|
{
|
|
return ProtocolIdEth;
|
|
}
|
|
|
|
int Eth2Protocol::fieldCount() const
|
|
{
|
|
return eth2_fieldCount;
|
|
}
|
|
|
|
QVariant Eth2Protocol::fieldData(int index, FieldAttrib attrib,
|
|
int streamIndex) const
|
|
{
|
|
switch (index)
|
|
{
|
|
case eth2_type:
|
|
{
|
|
quint16 type;
|
|
switch(attrib)
|
|
{
|
|
case FieldName:
|
|
return QString("Type");
|
|
case FieldValue:
|
|
type = payloadProtocolId(ProtocolIdEth);
|
|
return type;
|
|
case FieldTextValue:
|
|
type = payloadProtocolId(ProtocolIdEth);
|
|
return QString("0x%1").arg(type, 4, BASE_HEX, QChar('0'));
|
|
case FieldFrameValue:
|
|
{
|
|
QByteArray fv;
|
|
type = payloadProtocolId(ProtocolIdEth);
|
|
fv.resize(2);
|
|
qToBigEndian((quint16) type, (uchar*) fv.data());
|
|
return fv;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return AbstractProtocol::fieldData(index, attrib, streamIndex);
|
|
}
|
|
|
|
bool Eth2Protocol::setFieldData(int index, const QVariant &value,
|
|
FieldAttrib attrib)
|
|
{
|
|
bool isOk = false;
|
|
|
|
if (attrib != FieldValue)
|
|
return false;
|
|
|
|
switch (index)
|
|
{
|
|
case eth2_type:
|
|
{
|
|
uint type = value.toUInt(&isOk);
|
|
if (isOk)
|
|
data.set_type(type);
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
return isOk;
|
|
}
|
|
|
|
QWidget* Eth2Protocol::configWidget()
|
|
{
|
|
if (configForm == NULL)
|
|
{
|
|
configForm = new Eth2ConfigForm;
|
|
loadConfigWidget();
|
|
}
|
|
return configForm;
|
|
}
|
|
|
|
void Eth2Protocol::loadConfigWidget()
|
|
{
|
|
configWidget();
|
|
|
|
configForm->leType->setText(uintToHexStr(
|
|
fieldData(eth2_type, FieldValue).toUInt(), 2));
|
|
}
|
|
|
|
void Eth2Protocol::storeConfigWidget()
|
|
{
|
|
bool isOk;
|
|
|
|
configWidget();
|
|
|
|
data.set_type(configForm->leType->text().remove(QChar(' ')).toULong(&isOk, 16));
|
|
}
|
|
|