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
64 lines
1.3 KiB
C++
64 lines
1.3 KiB
C++
#ifndef _Vlan_H
|
|
#define _Vlan_H
|
|
|
|
#include "abstractprotocol.h"
|
|
|
|
#include "vlan.pb.h"
|
|
#include "ui_vlan.h"
|
|
|
|
class VlanConfigForm : public QWidget, public Ui::Vlan
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
VlanConfigForm(QWidget *parent = 0);
|
|
};
|
|
|
|
class VlanProtocol : public AbstractProtocol
|
|
{
|
|
private:
|
|
VlanConfigForm *configForm;
|
|
enum Vlanfield
|
|
{
|
|
vlan_tpid,
|
|
vlan_prio,
|
|
vlan_cfiDei,
|
|
vlan_vlanId,
|
|
|
|
// meta-fields
|
|
vlan_isOverrideTpid,
|
|
|
|
vlan_fieldCount
|
|
};
|
|
|
|
protected:
|
|
OstProto::Vlan data;
|
|
|
|
public:
|
|
VlanProtocol(StreamBase *stream, AbstractProtocol *parent = 0);
|
|
virtual ~VlanProtocol();
|
|
|
|
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 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 QWidget* configWidget();
|
|
virtual void loadConfigWidget();
|
|
virtual void storeConfigWidget();
|
|
};
|
|
|
|
#endif
|