4c2df3c5a7
--------- - all protocols on allocation of a configWidget, also populate it before returning from configWidget() - VLAN TPID override is now correctly saved and restored from/to its widget (vlan.cpp) - Payload protocol returns a minimum frame value of 1 byte size (Hack to avoid crash in stream config dialog when sum of all protocol frame sizes is greater than the frame length - small layout changes in mac widget (mac.ui) - src/dst ip mask changed from 255.255.255.255 to 255.255.255.0 (ip4.proto) - src mac changed from u32 to u64 (mac.proto) - "Combo Protocol" protocol container introduced to define newer protocols as a combination of existing protocols e.g. dot2 = dot3 + llc - THIS IS NOT YET COMPLETE (comboprotocol.h) Client/StreamConfigDialog ------------------------- - Advanced Protocol Selection implemented - Simple Protocol Selection rewritten to work alongside Advanced - Payload Widget is treated like any other protocol - hence it is not placedinto the dialog specially - Any protocol selection change (in Simple/Advanced mode) immediately triggers change in the Stream's protocolList - Protocol Widgets now are arranged in a toolBox on a top level tab of the dialog instead of a nested tabWidget - Vlan selection (Simple Mode) uses Radio buttons instead of checkboxes - Double Tagged (SVlan + CVlan) now works via Simple Mode
172 lines
3.4 KiB
C++
172 lines
3.4 KiB
C++
#include <qendian.h>
|
|
#include <QHostAddress>
|
|
|
|
#include "llc.h"
|
|
|
|
LlcConfigForm::LlcConfigForm(QWidget *parent)
|
|
: QWidget(parent)
|
|
{
|
|
setupUi(this);
|
|
}
|
|
|
|
LlcProtocol::LlcProtocol(StreamBase *stream)
|
|
: AbstractProtocol(stream)
|
|
{
|
|
configForm = NULL;
|
|
}
|
|
|
|
LlcProtocol::~LlcProtocol()
|
|
{
|
|
delete configForm;
|
|
}
|
|
|
|
AbstractProtocol* LlcProtocol::createInstance(StreamBase *stream)
|
|
{
|
|
return new LlcProtocol(stream);
|
|
}
|
|
|
|
quint32 LlcProtocol::protocolNumber() const
|
|
{
|
|
return OstProto::Protocol::kLlcFieldNumber;
|
|
}
|
|
|
|
void LlcProtocol::protoDataCopyInto(OstProto::Protocol &protocol) const
|
|
{
|
|
protocol.MutableExtension(OstProto::llc)->CopyFrom(data);
|
|
protocol.mutable_protocol_id()->set_id(protocolNumber());
|
|
}
|
|
|
|
void LlcProtocol::protoDataCopyFrom(const OstProto::Protocol &protocol)
|
|
{
|
|
if (protocol.protocol_id().id() == protocolNumber() &&
|
|
protocol.HasExtension(OstProto::llc))
|
|
data.MergeFrom(protocol.GetExtension(OstProto::llc));
|
|
}
|
|
|
|
QString LlcProtocol::name() const
|
|
{
|
|
return QString("802.3 Logical Link Control");
|
|
}
|
|
|
|
QString LlcProtocol::shortName() const
|
|
{
|
|
return QString("LLC");
|
|
}
|
|
|
|
int LlcProtocol::fieldCount() const
|
|
{
|
|
return llc_fieldCount;
|
|
}
|
|
|
|
QVariant LlcProtocol::fieldData(int index, FieldAttrib attrib,
|
|
int streamIndex) const
|
|
{
|
|
quint32 id;
|
|
quint8 dsap, ssap, ctl;
|
|
|
|
id = payloadProtocolId(ProtocolIdLlc);
|
|
dsap = (id >> 16) & 0xFF;
|
|
ssap = (id >> 8) & 0xFF;
|
|
ctl = (id >> 0) & 0xFF;
|
|
|
|
switch (index)
|
|
{
|
|
case llc_dsap:
|
|
switch(attrib)
|
|
{
|
|
case FieldName:
|
|
return QString("DSAP");
|
|
case FieldValue:
|
|
return dsap;
|
|
case FieldTextValue:
|
|
return QString("%1").arg(dsap, 2, BASE_HEX, QChar('0'));
|
|
case FieldFrameValue:
|
|
return QByteArray(1, (char)(dsap));
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
case llc_ssap:
|
|
switch(attrib)
|
|
{
|
|
case FieldName:
|
|
return QString("SSAP");
|
|
case FieldValue:
|
|
return ssap;
|
|
case FieldTextValue:
|
|
return QString("%1").arg(ssap, 2, BASE_HEX, QChar('0'));
|
|
case FieldFrameValue:
|
|
return QByteArray(1, (char)(ssap));
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
case llc_ctl:
|
|
switch(attrib)
|
|
{
|
|
case FieldName:
|
|
return QString("Control");
|
|
case FieldValue:
|
|
return ctl;
|
|
case FieldTextValue:
|
|
return QString("%1").arg(ctl, 2, BASE_HEX, QChar('0'));
|
|
case FieldFrameValue:
|
|
return QByteArray(1, (char)(ctl));
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return AbstractProtocol::fieldData(index, attrib, streamIndex);
|
|
}
|
|
|
|
bool LlcProtocol::setFieldData(int index, const QVariant &value,
|
|
FieldAttrib attrib)
|
|
{
|
|
// FIXME
|
|
return false;
|
|
}
|
|
|
|
|
|
QWidget* LlcProtocol::configWidget()
|
|
{
|
|
if (configForm == NULL)
|
|
{
|
|
configForm = new LlcConfigForm;
|
|
loadConfigWidget();
|
|
}
|
|
return configForm;
|
|
}
|
|
|
|
void LlcProtocol::loadConfigWidget()
|
|
{
|
|
#define uintToHexStr(num, bytes) \
|
|
QString("%1").arg(num, bytes*2, BASE_HEX, QChar('0'))
|
|
|
|
configWidget();
|
|
|
|
configForm->leDsap->setText(uintToHexStr(
|
|
fieldData(llc_dsap, FieldValue).toUInt(), 1));
|
|
configForm->leSsap->setText(uintToHexStr(
|
|
fieldData(llc_ssap, FieldValue).toUInt(), 1));
|
|
configForm->leControl->setText(uintToHexStr(
|
|
fieldData(llc_ctl, FieldValue).toUInt(), 1));
|
|
#undef uintToHexStr
|
|
}
|
|
|
|
void LlcProtocol::storeConfigWidget()
|
|
{
|
|
bool isOk;
|
|
|
|
configWidget();
|
|
|
|
data.set_dsap(configForm->leDsap->text().toULong(&isOk, BASE_HEX));
|
|
data.set_ssap(configForm->leSsap->text().toULong(&isOk, BASE_HEX));
|
|
data.set_ctl(configForm->leControl->text().toULong(&isOk, BASE_HEX));
|
|
}
|
|
|