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
50 lines
1.1 KiB
C++
50 lines
1.1 KiB
C++
#include <qendian.h>
|
|
|
|
#include "svlan.h"
|
|
#include "svlan.pb.h"
|
|
|
|
SVlanProtocol::SVlanProtocol(StreamBase *stream, AbstractProtocol *parent)
|
|
: VlanProtocol(stream, parent)
|
|
{
|
|
data.set_tpid(0x88a8);
|
|
data.set_is_override_tpid(true);
|
|
}
|
|
|
|
SVlanProtocol::~SVlanProtocol()
|
|
{
|
|
}
|
|
|
|
AbstractProtocol* SVlanProtocol::createInstance(StreamBase *stream,
|
|
AbstractProtocol *parent)
|
|
{
|
|
return new SVlanProtocol(stream, parent);
|
|
}
|
|
|
|
quint32 SVlanProtocol::protocolNumber() const
|
|
{
|
|
return OstProto::Protocol::kSvlanFieldNumber;
|
|
}
|
|
|
|
void SVlanProtocol::protoDataCopyInto(OstProto::Protocol &protocol) const
|
|
{
|
|
protocol.MutableExtension(OstProto::svlan)->CopyFrom(data);
|
|
protocol.mutable_protocol_id()->set_id(protocolNumber());
|
|
}
|
|
|
|
void SVlanProtocol::protoDataCopyFrom(const OstProto::Protocol &protocol)
|
|
{
|
|
if (protocol.protocol_id().id() == protocolNumber() &&
|
|
protocol.HasExtension(OstProto::svlan))
|
|
data.MergeFrom(protocol.GetExtension(OstProto::svlan));
|
|
}
|
|
|
|
QString SVlanProtocol::name() const
|
|
{
|
|
return QString("SVlan");
|
|
}
|
|
|
|
QString SVlanProtocol::shortName() const
|
|
{
|
|
return QString("SVlan");
|
|
}
|