84c7fe1e06
- Added support for retrieving the packet capture buffer from server to client (does not work consistently however - needs investigation) - getCaptureBuffer() Rpc signature changed - RPC: Added support in Rpc Channel (client) to queue calls - RPC: Added support for transferring arbitrary binary data from server to client (used to get packet capture files) - Rpc header changed - length is now 4 bytes instead of 2; there is no rsvd field any longer Fixes - RPC: Fix for the case when a msg is not received all at once over the socket - StreamConfigDialog: fixed display issue in packet view for combo protocols containing meta fields - Fixed issue with Stacked Vlan not retaining data for both CVlan and SVlan - Fixed incorrect payload size issue with increment/decrement frame length modes Refactoring, Cleanup etc. - RPC: Minor code and TODOs cleanup - Server: Minor code and TODOs cleanup - Server: Removed unused file(s): rxtx.cpp, rxtx.h - Server: Replaced direct use of ProtocolList with the ProtocolListIterator - Common: Minor code and TODOs cleanup - StreamBase::frameLen() now returns the length based on the mode/min/max and the passed in streamIndex - AbstractProtocol interface changed for methods - protocolFrameSize(), protocolFrameOffset(), protocolFramePayloadSize() : all of them now take streamIndex as an optional param with 0 as the default value - Protocols implementing the above methods changed accordingly
238 lines
4.6 KiB
C++
238 lines
4.6 KiB
C++
#include <qendian.h>
|
|
|
|
#include "vlan.h"
|
|
|
|
VlanConfigForm::VlanConfigForm(QWidget *parent)
|
|
: QWidget(parent)
|
|
{
|
|
setupUi(this);
|
|
}
|
|
|
|
VlanProtocol::VlanProtocol(StreamBase *stream, AbstractProtocol *parent)
|
|
: AbstractProtocol(stream, parent)
|
|
{
|
|
configForm = NULL;
|
|
}
|
|
|
|
VlanProtocol::~VlanProtocol()
|
|
{
|
|
delete configForm;
|
|
}
|
|
|
|
AbstractProtocol* VlanProtocol::createInstance(StreamBase *stream,
|
|
AbstractProtocol *parent)
|
|
{
|
|
return new VlanProtocol(stream, parent);
|
|
}
|
|
|
|
quint32 VlanProtocol::protocolNumber() const
|
|
{
|
|
return OstProto::Protocol::kVlanFieldNumber;
|
|
}
|
|
|
|
void VlanProtocol::protoDataCopyInto(OstProto::Protocol &protocol) const
|
|
{
|
|
protocol.MutableExtension(OstProto::vlan)->CopyFrom(data);
|
|
protocol.mutable_protocol_id()->set_id(protocolNumber());
|
|
}
|
|
|
|
void VlanProtocol::protoDataCopyFrom(const OstProto::Protocol &protocol)
|
|
{
|
|
if (protocol.protocol_id().id() == protocolNumber() &&
|
|
protocol.HasExtension(OstProto::vlan))
|
|
data.MergeFrom(protocol.GetExtension(OstProto::vlan));
|
|
}
|
|
|
|
QString VlanProtocol::name() const
|
|
{
|
|
return QString("Vlan");
|
|
}
|
|
|
|
QString VlanProtocol::shortName() const
|
|
{
|
|
return QString("Vlan");
|
|
}
|
|
|
|
int VlanProtocol::fieldCount() const
|
|
{
|
|
return vlan_fieldCount;
|
|
}
|
|
|
|
AbstractProtocol::FieldFlags VlanProtocol::fieldFlags(int index) const
|
|
{
|
|
AbstractProtocol::FieldFlags flags;
|
|
|
|
flags = AbstractProtocol::fieldFlags(index);
|
|
|
|
switch (index)
|
|
{
|
|
case vlan_tpid:
|
|
case vlan_prio:
|
|
case vlan_cfiDei:
|
|
case vlan_vlanId:
|
|
break;
|
|
|
|
// meta-fields
|
|
case vlan_isOverrideTpid:
|
|
flags |= FieldIsMeta;
|
|
break;
|
|
}
|
|
|
|
return flags;
|
|
}
|
|
|
|
QVariant VlanProtocol::fieldData(int index, FieldAttrib attrib,
|
|
int streamIndex) const
|
|
{
|
|
switch (index)
|
|
{
|
|
case vlan_tpid:
|
|
{
|
|
quint16 tpid;
|
|
|
|
tpid = data.is_override_tpid() ? data.tpid() : 0x8100;
|
|
|
|
switch(attrib)
|
|
{
|
|
case FieldName:
|
|
return QString("Tag Protocol Id");
|
|
case FieldValue:
|
|
return tpid;
|
|
case FieldTextValue:
|
|
return QString("0x%1").arg(tpid, 2, BASE_HEX, QChar('0'));
|
|
case FieldFrameValue:
|
|
{
|
|
QByteArray fv;
|
|
fv.resize(2);
|
|
qToBigEndian(tpid, (uchar*) fv.data());
|
|
return fv;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
}
|
|
|
|
case vlan_prio:
|
|
{
|
|
uint prio = ((data.vlan_tag() >> 13) & 0x07);
|
|
|
|
switch(attrib)
|
|
{
|
|
case FieldName:
|
|
return QString("Priority");
|
|
case FieldValue:
|
|
return prio;
|
|
case FieldTextValue:
|
|
return QString("%1").arg(prio);
|
|
case FieldFrameValue:
|
|
return QByteArray(1, (char) prio);
|
|
case FieldBitSize:
|
|
return 3;
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
}
|
|
|
|
case vlan_cfiDei:
|
|
{
|
|
uint cfiDei = ((data.vlan_tag() >> 12) & 0x01);
|
|
|
|
switch(attrib)
|
|
{
|
|
case FieldName:
|
|
return QString("CFI/DEI");
|
|
case FieldValue:
|
|
return cfiDei;
|
|
case FieldTextValue:
|
|
return QString("%1").arg(cfiDei);
|
|
case FieldFrameValue:
|
|
return QByteArray(1, (char) cfiDei);
|
|
case FieldBitSize:
|
|
return 1;
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
}
|
|
|
|
case vlan_vlanId:
|
|
{
|
|
quint16 vlanId = (data.vlan_tag() & 0x0FFF);
|
|
|
|
switch(attrib)
|
|
{
|
|
case FieldName:
|
|
return QString("VLAN Id");
|
|
case FieldValue:
|
|
return vlanId;
|
|
case FieldTextValue:
|
|
return QString("%1").arg(vlanId);
|
|
case FieldFrameValue:
|
|
{
|
|
QByteArray fv;
|
|
fv.resize(2);
|
|
qToBigEndian((quint16) vlanId, (uchar*) fv.data());
|
|
return fv;
|
|
}
|
|
case FieldBitSize:
|
|
return 12;
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
}
|
|
// Meta fields
|
|
|
|
case vlan_isOverrideTpid:
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return AbstractProtocol::fieldData(index, attrib, streamIndex);
|
|
}
|
|
|
|
bool VlanProtocol::setFieldData(int index, const QVariant &value,
|
|
FieldAttrib attrib)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
|
|
QWidget* VlanProtocol::configWidget()
|
|
{
|
|
if (configForm == NULL)
|
|
{
|
|
configForm = new VlanConfigForm;
|
|
loadConfigWidget();
|
|
}
|
|
return configForm;
|
|
}
|
|
|
|
void VlanProtocol::loadConfigWidget()
|
|
{
|
|
configWidget();
|
|
|
|
configForm->cbTpidOverride->setChecked(data.is_override_tpid());
|
|
configForm->leTpid->setText(uintToHexStr(fieldData(vlan_tpid, FieldValue).toUInt(), 2));
|
|
configForm->cmbPrio->setCurrentIndex(fieldData(vlan_prio, FieldValue).toUInt());
|
|
configForm->cmbCfiDei->setCurrentIndex(fieldData(vlan_cfiDei, FieldValue).toUInt());
|
|
configForm->leVlanId->setText(fieldData(vlan_vlanId, FieldValue).toString());
|
|
}
|
|
|
|
void VlanProtocol::storeConfigWidget()
|
|
{
|
|
bool isOk;
|
|
|
|
configWidget();
|
|
|
|
data.set_is_override_tpid(configForm->cbTpidOverride->isChecked());
|
|
data.set_tpid(configForm->leTpid->text().remove(QChar(' ')).toULong(&isOk, BASE_HEX));
|
|
data.set_vlan_tag(
|
|
((configForm->cmbPrio->currentIndex() & 0x07) << 13) |
|
|
((configForm->cmbCfiDei->currentIndex() & 0x01) << 12) |
|
|
(configForm->leVlanId->text().toULong(&isOk) & 0x0FFF));
|
|
}
|
|
|