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
119 lines
3.4 KiB
C++
119 lines
3.4 KiB
C++
#ifndef _PORT_GROUP_H
|
|
#define _PORT_GROUP_H
|
|
|
|
#include "port.h"
|
|
#include <QHostAddress>
|
|
#include <QTcpSocket>
|
|
|
|
#include "../common/protocol.pb.h"
|
|
#include "pbrpcchannel.h"
|
|
|
|
/* TODO
|
|
HIGH
|
|
MED
|
|
LOW
|
|
- Allow hostnames in addition to IP Address as "server address"
|
|
*/
|
|
|
|
#define DEFAULT_SERVER_PORT 7878
|
|
|
|
class QFile;
|
|
|
|
class PortGroup : public QObject {
|
|
Q_OBJECT
|
|
|
|
private:
|
|
quint32 mPortGroupId;
|
|
static quint32 mPortGroupAllocId;
|
|
QString mUserAlias; // user defined
|
|
#if 0 // PB
|
|
QTcpSocket *mpSocket;
|
|
QHostAddress mServerAddress;
|
|
quint16 mServerPort;
|
|
#endif
|
|
PbRpcChannel *rpcChannel;
|
|
PbRpcController *rpcController;
|
|
PbRpcController *rpcControllerStats;
|
|
::OstProto::OstService::Stub *serviceStub;
|
|
|
|
::OstProto::PortIdList portIdList;
|
|
public: // FIXME(HIGH): member access
|
|
QList<Port> mPorts;
|
|
|
|
public:
|
|
PortGroup(QHostAddress ip = QHostAddress::LocalHost,
|
|
quint16 port = DEFAULT_SERVER_PORT);
|
|
~PortGroup();
|
|
|
|
void connectToHost() { rpcChannel->establish(); }
|
|
void connectToHost(QHostAddress ip, quint16 port)
|
|
{ rpcChannel->establish(ip, port); }
|
|
void disconnectFromHost() { rpcChannel->tearDown(); }
|
|
|
|
int numPorts() const { return mPorts.size(); }
|
|
quint32 id() const { return mPortGroupId; }
|
|
|
|
const QString& userAlias() const { return mUserAlias; }
|
|
void setUserAlias(QString alias) { mUserAlias = alias; };
|
|
|
|
const QHostAddress& serverAddress() const
|
|
{ return rpcChannel->serverAddress(); }
|
|
quint16 serverPort() const
|
|
{ return rpcChannel->serverPort(); }
|
|
QAbstractSocket::SocketState state() const
|
|
{ return rpcChannel->state(); }
|
|
|
|
void processPortIdList(OstProto::PortIdList *portIdList);
|
|
void processPortConfigList(OstProto::PortConfigList *portConfigList);
|
|
|
|
void getStreamIdList(int portIndex = 0,
|
|
OstProto::StreamIdList *streamIdList = NULL);
|
|
void getStreamConfigList(int portIndex = 0,
|
|
OstProto::StreamConfigList *streamConfigList = NULL);
|
|
|
|
void processModifyStreamAck(OstProto::Ack *ack);
|
|
|
|
void startTx(QList<uint> *portList = NULL);
|
|
void processStartTxAck(OstProto::Ack *ack);
|
|
void stopTx(QList<uint> *portList = NULL);
|
|
void processStopTxAck(OstProto::Ack *ack);
|
|
|
|
void startCapture(QList<uint> *portList = NULL);
|
|
void processStartCaptureAck(OstProto::Ack *ack);
|
|
void stopCapture(QList<uint> *portList = NULL);
|
|
void processStopCaptureAck(OstProto::Ack *ack);
|
|
void viewCapture(QList<uint> *portList = NULL);
|
|
void processViewCaptureAck(OstProto::CaptureBuffer *buf, QFile *capFile);
|
|
|
|
void getPortStats();
|
|
void processPortStatsList(OstProto::PortStatsList *portStatsList);
|
|
void clearPortStats(QList<uint> *portList = NULL);
|
|
void processClearStatsAck(OstProto::Ack *ack);
|
|
|
|
signals:
|
|
void portGroupDataChanged(PortGroup* portGroup);
|
|
void portListAboutToBeChanged(quint32 portGroupId);
|
|
void portListChanged(quint32 portGroupId);
|
|
void statsChanged(quint32 portGroupId);
|
|
|
|
private slots:
|
|
void on_rpcChannel_stateChanged();
|
|
void on_rpcChannel_connected();
|
|
void on_rpcChannel_disconnected();
|
|
void on_rpcChannel_error(QAbstractSocket::SocketError socketError);
|
|
|
|
public slots:
|
|
void when_configApply(int portIndex, uint *cookie = NULL);
|
|
#if 0 // PB
|
|
void on_rpcChannel_when_dataAvail();
|
|
#endif
|
|
|
|
private:
|
|
#if 0 // PB
|
|
void ProcessCapabilityInfo(const char *msg, qint32 size);
|
|
void ProcessMsg(const char *msg, quint32 size);
|
|
#endif
|
|
};
|
|
|
|
#endif
|