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
45 lines
956 B
C++
45 lines
956 B
C++
#ifndef _RPC_SERVER_H
|
|
#define _RPC_SERVER_H
|
|
|
|
#include <google/protobuf/message.h>
|
|
#include <google/protobuf/descriptor.h>
|
|
#include <google/protobuf/service.h>
|
|
|
|
#include <QTcpServer>
|
|
#include <QTcpSocket>
|
|
|
|
#include "pbrpccommon.h"
|
|
#include "pbrpccontroller.h"
|
|
|
|
|
|
class RpcServer : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
QTcpServer *server;
|
|
QTcpSocket *clientSock;
|
|
|
|
::google::protobuf::Service *service;
|
|
|
|
bool isPending;
|
|
int pendingMethodId;
|
|
|
|
void LogInt (QString log) {qDebug("%s", log.toAscii().data());}
|
|
|
|
public:
|
|
RpcServer(); //! \todo (LOW) use 'parent' param
|
|
virtual ~RpcServer();
|
|
|
|
bool registerService(::google::protobuf::Service *service,
|
|
quint16 tcpPortNum);
|
|
void done(::google::protobuf::Message *resp, PbRpcController *controller);
|
|
|
|
private slots:
|
|
void when_newConnection();
|
|
void when_disconnected();
|
|
void when_dataAvail();
|
|
void when_error(QAbstractSocket::SocketError socketError);
|
|
};
|
|
|
|
#endif
|