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
66 lines
1.5 KiB
C++
66 lines
1.5 KiB
C++
#ifndef _PAYLOAD_H
|
|
#define _PAYLOAD_H
|
|
|
|
#include "abstractprotocol.h"
|
|
|
|
#include "payload.pb.h"
|
|
#include "ui_payload.h"
|
|
|
|
class PayloadConfigForm : public QWidget, public Ui::payload
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
PayloadConfigForm(QWidget *parent = 0);
|
|
private slots:
|
|
void on_cmbPatternMode_currentIndexChanged(int index);
|
|
};
|
|
|
|
class PayloadProtocol : public AbstractProtocol
|
|
{
|
|
private:
|
|
OstProto::Payload data;
|
|
PayloadConfigForm *configForm;
|
|
enum payloadfield
|
|
{
|
|
payload_dataPattern,
|
|
|
|
// Meta fields
|
|
payload_dataPatternMode,
|
|
|
|
payload_fieldCount
|
|
};
|
|
|
|
public:
|
|
PayloadProtocol(StreamBase *stream, AbstractProtocol *parent = 0);
|
|
virtual ~PayloadProtocol();
|
|
|
|
static AbstractProtocol* createInstance(StreamBase *stream,
|
|
AbstractProtocol *parent = 0);
|
|
virtual quint32 protocolNumber() const;
|
|
|
|
virtual void protoDataCopyInto(OstProto::Protocol &protocol) const;
|
|
virtual void protoDataCopyFrom(const OstProto::Protocol &protocol);
|
|
|
|
virtual QString name() const;
|
|
virtual QString shortName() const;
|
|
|
|
virtual int protocolFrameSize(int streamIndex = 0) const;
|
|
|
|
virtual int fieldCount() const;
|
|
|
|
virtual AbstractProtocol::FieldFlags fieldFlags(int index) const;
|
|
virtual QVariant fieldData(int index, FieldAttrib attrib,
|
|
int streamIndex = 0) const;
|
|
virtual bool setFieldData(int index, const QVariant &value,
|
|
FieldAttrib attrib = FieldValue);
|
|
|
|
virtual bool isProtocolFrameValueVariable() const;
|
|
virtual bool isProtocolFrameSizeVariable() const;
|
|
|
|
virtual QWidget* configWidget();
|
|
virtual void loadConfigWidget();
|
|
virtual void storeConfigWidget();
|
|
};
|
|
|
|
#endif
|