0094f618d3
-------------------------- - AbstractProtocol Constructor and Factory function now take an optional (default NULL) "parent" abstract protocol in addition to the stream; this "parent" protocol is non-NULL for protocols which are aggregated in a ComboProtocol - All subclasses of AbstractProtocol modified as per the above interface change - ProtocolManager also modifed as per the above interface change - new data members in AbstractProtocol - prev, next; the AbstractProtocol implementation now uses these members to traverse protocols on the list instead of ProtocolListIterator; this change required for ComboProtocol - ProtocolListIterator updates these new members - prev/next on insert/remove/replace - ComboProtocol and ProtocolListIterator classes made friends of AbstractProtocol - ComboProtocol implemented as a template class (completed) - Dot2LLc implemented as a combo of Dot3Raw and LLC - Dot2Snap implemented as a combo of Dot2Llc and SNAP - VlanStack implemented as a combo of VLAN + VLAN - ProtocolManager now uses the ProtocolId enums rather than hardcoded values Stream Config Dialog -------------------- - "None" radio button added to all protocol levels - Protocol Level 1 added with 'mac' as the only valid protocol in the "simple" mode widget - With Dot2Llc, Dot2Snap and VlanStack implemented as "combo" protocols, the protocol choice radiobuttons in the "simple" mode are now 1:1 with a protocol; this has the following implications/advantages: - Updates of the "simple" mode widget from/to stream's protocolList is simpler; this code has now been rewritten to take advantage of 1:1 - This paves the way for exporting tunneled protocols 4over4, 4over6, 6over4 etc. in the "simple" mode - This should also (hopefully) require less changes when adding a new protocol; more work needs to be done to reach this goal Fixes ----- - Dot3Protocol now derives "length" correctly for VLAN tagged packets - StreamBase now uses the ProtocolListIterator to append the default protocols in a stream instead of directly manipulating ProtocolList; also in protoDataCopyFrom() Others (Client/Server) ---------------------- - Port Packet Capture implemented; "view capture" is pending (hack put in place now for testing)
31 lines
633 B
C++
31 lines
633 B
C++
#ifndef _PROTOCOL_MANAGER_H
|
|
#define _PROTOCOL_MANAGER_H
|
|
|
|
#include <QMap>
|
|
#include <QStringList>
|
|
|
|
class AbstractProtocol;
|
|
class StreamBase;
|
|
|
|
class ProtocolManager
|
|
{
|
|
QMap<int, QString> numberToNameMap;
|
|
QMap<QString, int> nameToNumberMap;
|
|
QMap<int, void*> factory;
|
|
|
|
public:
|
|
ProtocolManager();
|
|
|
|
void registerProtocol(int protoNumber, QString protoName,
|
|
void *protoCreator);
|
|
|
|
AbstractProtocol* createProtocol(int protoNumber, StreamBase *stream,
|
|
AbstractProtocol *parent = 0);
|
|
AbstractProtocol* createProtocol(QString protoName, StreamBase *stream,
|
|
AbstractProtocol *parent = 0);
|
|
|
|
QStringList protocolDatabase();
|
|
};
|
|
|
|
#endif
|