0094f618d3
-------------------------- - AbstractProtocol Constructor and Factory function now take an optional (default NULL) "parent" abstract protocol in addition to the stream; this "parent" protocol is non-NULL for protocols which are aggregated in a ComboProtocol - All subclasses of AbstractProtocol modified as per the above interface change - ProtocolManager also modifed as per the above interface change - new data members in AbstractProtocol - prev, next; the AbstractProtocol implementation now uses these members to traverse protocols on the list instead of ProtocolListIterator; this change required for ComboProtocol - ProtocolListIterator updates these new members - prev/next on insert/remove/replace - ComboProtocol and ProtocolListIterator classes made friends of AbstractProtocol - ComboProtocol implemented as a template class (completed) - Dot2LLc implemented as a combo of Dot3Raw and LLC - Dot2Snap implemented as a combo of Dot2Llc and SNAP - VlanStack implemented as a combo of VLAN + VLAN - ProtocolManager now uses the ProtocolId enums rather than hardcoded values Stream Config Dialog -------------------- - "None" radio button added to all protocol levels - Protocol Level 1 added with 'mac' as the only valid protocol in the "simple" mode widget - With Dot2Llc, Dot2Snap and VlanStack implemented as "combo" protocols, the protocol choice radiobuttons in the "simple" mode are now 1:1 with a protocol; this has the following implications/advantages: - Updates of the "simple" mode widget from/to stream's protocolList is simpler; this code has now been rewritten to take advantage of 1:1 - This paves the way for exporting tunneled protocols 4over4, 4over6, 6over4 etc. in the "simple" mode - This should also (hopefully) require less changes when adding a new protocol; more work needs to be done to reach this goal Fixes ----- - Dot3Protocol now derives "length" correctly for VLAN tagged packets - StreamBase now uses the ProtocolListIterator to append the default protocols in a stream instead of directly manipulating ProtocolList; also in protoDataCopyFrom() Others (Client/Server) ---------------------- - Port Packet Capture implemented; "view capture" is pending (hack put in place now for testing)
149 lines
2.7 KiB
C++
149 lines
2.7 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");
|
|
}
|
|
|
|
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));
|
|
}
|
|
|