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
175 lines
3.4 KiB
C++
175 lines
3.4 KiB
C++
#include <qendian.h>
|
|
#include <QHostAddress>
|
|
|
|
#include "snap.h"
|
|
|
|
SnapConfigForm::SnapConfigForm(QWidget *parent)
|
|
: QWidget(parent)
|
|
{
|
|
setupUi(this);
|
|
}
|
|
|
|
SnapProtocol::SnapProtocol(StreamBase *stream, AbstractProtocol *parent)
|
|
: AbstractProtocol(stream, parent)
|
|
{
|
|
configForm = NULL;
|
|
}
|
|
|
|
SnapProtocol::~SnapProtocol()
|
|
{
|
|
delete configForm;
|
|
}
|
|
|
|
AbstractProtocol* SnapProtocol::createInstance(StreamBase *stream,
|
|
AbstractProtocol *parent)
|
|
{
|
|
return new SnapProtocol(stream, parent);
|
|
}
|
|
|
|
quint32 SnapProtocol::protocolNumber() const
|
|
{
|
|
return OstProto::Protocol::kSnapFieldNumber;
|
|
}
|
|
|
|
void SnapProtocol::protoDataCopyInto(OstProto::Protocol &protocol) const
|
|
{
|
|
protocol.MutableExtension(OstProto::snap)->CopyFrom(data);
|
|
protocol.mutable_protocol_id()->set_id(protocolNumber());
|
|
}
|
|
|
|
void SnapProtocol::protoDataCopyFrom(const OstProto::Protocol &protocol)
|
|
{
|
|
if (protocol.protocol_id().id() == protocolNumber() &&
|
|
protocol.HasExtension(OstProto::snap))
|
|
data.MergeFrom(protocol.GetExtension(OstProto::snap));
|
|
}
|
|
|
|
QString SnapProtocol::name() const
|
|
{
|
|
return QString("SubNetwork Access Protocol");
|
|
}
|
|
|
|
QString SnapProtocol::shortName() const
|
|
{
|
|
return QString("SNAP");
|
|
}
|
|
|
|
AbstractProtocol::ProtocolIdType SnapProtocol::protocolIdType() const
|
|
{
|
|
return ProtocolIdEth;
|
|
}
|
|
|
|
quint32 SnapProtocol::protocolId(ProtocolIdType type) const
|
|
{
|
|
switch(type)
|
|
{
|
|
case ProtocolIdLlc: return 0xAAAA03;
|
|
default: break;
|
|
}
|
|
|
|
return AbstractProtocol::protocolId(type);
|
|
}
|
|
|
|
int SnapProtocol::fieldCount() const
|
|
{
|
|
return snap_fieldCount;
|
|
}
|
|
|
|
QVariant SnapProtocol::fieldData(int index, FieldAttrib attrib,
|
|
int streamIndex) const
|
|
{
|
|
switch (index)
|
|
{
|
|
case snap_oui:
|
|
switch(attrib)
|
|
{
|
|
case FieldName:
|
|
return QString("OUI");
|
|
case FieldValue:
|
|
return data.oui();
|
|
case FieldTextValue:
|
|
return QString("%1").arg(data.oui(), 6, BASE_HEX, QChar('0'));
|
|
case FieldFrameValue:
|
|
{
|
|
QByteArray fv;
|
|
fv.resize(4);
|
|
qToBigEndian((quint32) data.oui(), (uchar*) fv.data());
|
|
fv.remove(0, 1);
|
|
return fv;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
case snap_type:
|
|
{
|
|
quint16 type;
|
|
|
|
switch(attrib)
|
|
{
|
|
case FieldName:
|
|
return QString("Type");
|
|
case FieldValue:
|
|
type = payloadProtocolId(ProtocolIdEth);
|
|
return type;
|
|
case FieldTextValue:
|
|
type = payloadProtocolId(ProtocolIdEth);
|
|
return QString("%1").arg(type, 4, BASE_HEX, QChar('0'));
|
|
case FieldFrameValue:
|
|
{
|
|
QByteArray fv;
|
|
fv.resize(2);
|
|
type = payloadProtocolId(ProtocolIdEth);
|
|
qToBigEndian(type, (uchar*) fv.data());
|
|
return fv;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return AbstractProtocol::fieldData(index, attrib, streamIndex);
|
|
}
|
|
|
|
bool SnapProtocol::setFieldData(int index, const QVariant &value,
|
|
FieldAttrib attrib)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
|
|
QWidget* SnapProtocol::configWidget()
|
|
{
|
|
if (configForm == NULL)
|
|
{
|
|
configForm = new SnapConfigForm;
|
|
loadConfigWidget();
|
|
}
|
|
return configForm;
|
|
}
|
|
|
|
void SnapProtocol::loadConfigWidget()
|
|
{
|
|
configWidget();
|
|
|
|
configForm->leOui->setText(uintToHexStr(
|
|
fieldData(snap_oui, FieldValue).toUInt(), 3));
|
|
configForm->leType->setText(uintToHexStr(
|
|
fieldData(snap_type, FieldValue).toUInt(), 2));
|
|
}
|
|
|
|
void SnapProtocol::storeConfigWidget()
|
|
{
|
|
bool isOk;
|
|
|
|
configWidget();
|
|
|
|
data.set_oui(configForm->leOui->text().toULong(&isOk, BASE_HEX));
|
|
data.set_type(configForm->leType->text().toULong(&isOk, BASE_HEX));
|
|
}
|
|
|