4c2df3c5a7
--------- - all protocols on allocation of a configWidget, also populate it before returning from configWidget() - VLAN TPID override is now correctly saved and restored from/to its widget (vlan.cpp) - Payload protocol returns a minimum frame value of 1 byte size (Hack to avoid crash in stream config dialog when sum of all protocol frame sizes is greater than the frame length - small layout changes in mac widget (mac.ui) - src/dst ip mask changed from 255.255.255.255 to 255.255.255.0 (ip4.proto) - src mac changed from u32 to u64 (mac.proto) - "Combo Protocol" protocol container introduced to define newer protocols as a combination of existing protocols e.g. dot2 = dot3 + llc - THIS IS NOT YET COMPLETE (comboprotocol.h) Client/StreamConfigDialog ------------------------- - Advanced Protocol Selection implemented - Simple Protocol Selection rewritten to work alongside Advanced - Payload Widget is treated like any other protocol - hence it is not placedinto the dialog specially - Any protocol selection change (in Simple/Advanced mode) immediately triggers change in the Stream's protocolList - Protocol Widgets now are arranged in a toolBox on a top level tab of the dialog instead of a nested tabWidget - Vlan selection (Simple Mode) uses Radio buttons instead of checkboxes - Double Tagged (SVlan + CVlan) now works via Simple Mode
77 lines
1.4 KiB
Prolog
77 lines
1.4 KiB
Prolog
TEMPLATE = lib
|
|
CONFIG += qt staticlib
|
|
QT += network
|
|
LIBS += \
|
|
-lprotobuf
|
|
FORMS += \
|
|
mac.ui \
|
|
payload.ui \
|
|
eth2.ui \
|
|
dot3.ui \
|
|
llc.ui \
|
|
snap.ui \
|
|
vlan.ui \
|
|
ip4.ui \
|
|
tcp.ui \
|
|
udp.ui
|
|
PROTOS += \
|
|
protocol.proto \
|
|
mac.proto \
|
|
payload.proto \
|
|
eth2.proto \
|
|
dot3.proto \
|
|
llc.proto \
|
|
snap.proto \
|
|
vlan.proto \
|
|
ip4.proto \
|
|
tcp.proto \
|
|
udp.proto
|
|
HEADERS += \
|
|
abstractprotocol.h \
|
|
comboprotocol.h \
|
|
protocolmanager.h \
|
|
protocollist.h \
|
|
protocollistiterator.h \
|
|
streambase.h \
|
|
mac.h \
|
|
payload.h \
|
|
eth2.h \
|
|
dot3.h \
|
|
llc.h \
|
|
snap.h \
|
|
vlan.h \
|
|
ip4.h \
|
|
tcp.h \
|
|
udp.h
|
|
SOURCES += \
|
|
abstractprotocol.cpp \
|
|
protocolmanager.cpp \
|
|
protocollist.cpp \
|
|
protocollistiterator.cpp \
|
|
streambase.cpp \
|
|
mac.cpp \
|
|
payload.cpp \
|
|
eth2.cpp \
|
|
dot3.cpp \
|
|
llc.cpp \
|
|
snap.cpp \
|
|
vlan.cpp \
|
|
ip4.cpp \
|
|
tcp.cpp \
|
|
udp.cpp
|
|
|
|
protobuf_decl.name = protobuf header
|
|
protobuf_decl.input = PROTOS
|
|
protobuf_decl.output = ${QMAKE_FILE_BASE}.pb.h
|
|
protobuf_decl.commands = protoc --cpp_out="." ${QMAKE_FILE_NAME}
|
|
protobuf_decl.variable_out = GENERATED_FILES
|
|
QMAKE_EXTRA_COMPILERS += protobuf_decl
|
|
|
|
protobuf_impl.name = protobuf implementation
|
|
protobuf_impl.input = PROTOS
|
|
protobuf_impl.output = ${QMAKE_FILE_BASE}.pb.cc
|
|
protobuf_impl.depends = ${QMAKE_FILE_BASE}.pb.h
|
|
protobuf_impl.commands = $$escape_expand(\n)
|
|
protobuf_impl.variable_out = GENERATED_SOURCES
|
|
QMAKE_EXTRA_COMPILERS += protobuf_impl
|