Wireshark-commits: [Wireshark-commits] master 9769df5: KNX-IP: new KNXnet/IP dissector
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9769df50efd830254aef0310562cdf47edd4ada3
Submitter: "Roland Knall <rknall@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
9769df5 by Ralf Nasilowski (Ralf.Nasilowski@xxxxxx):
KNX-IP: new KNXnet/IP dissector
The new KNXnet/IP dissector replaces the old KNXnet/IP dissector.
The new KNXnet/IP dissector supports the new KNX features
- A_MemoryExtended services
- A_PropertyExt services
- KNX Data Security
- KNXnet/IP Core V2
- KNXnet/IP Device Management V2
- KNXnet/IP Tunneling V2
- KNXnet/IP Routing V2
- KNXnet/IP Security
Change-Id: I3d1d716ef03d16d2720e6a1fcb23c2243d1cd956
Reviewed-on: https://code.wireshark.org/review/29155
Petri-Dish: Roland Knall <rknall@xxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Reviewed-by: Roland Knall <rknall@xxxxxxxxx>
Actions performed:
from 84fd2d7 licensecheck: fix detection of multiple licenses
add 9769df5 KNX-IP: new KNXnet/IP dissector
Summary of changes:
epan/dissectors/CMakeLists.txt | 6 +-
epan/dissectors/packet-cemi.c | 3515 +++++++++++++++++++++++++++
epan/dissectors/packet-knxip.c | 4136 ++++++++++++++++++++++++++++++++
epan/dissectors/packet-knxip.h | 56 +
epan/dissectors/packet-knxip_decrypt.c | 811 +++++++
epan/dissectors/packet-knxip_decrypt.h | 97 +
epan/dissectors/packet-knxnetip.c | 1842 --------------
test/captures/knxip_DataSec.pcap | Bin 0 -> 125 bytes
test/captures/knxip_SecureWrapper.pcap | Bin 0 -> 137 bytes
test/captures/knxip_TimerNotify.pcap | Bin 0 -> 118 bytes
test/keys/knx_keyring.xml | 58 +
test/suite_decryption.py | 115 +
12 files changed, 8793 insertions(+), 1843 deletions(-)
create mode 100644 epan/dissectors/packet-cemi.c
create mode 100644 epan/dissectors/packet-knxip.c
create mode 100644 epan/dissectors/packet-knxip.h
create mode 100644 epan/dissectors/packet-knxip_decrypt.c
create mode 100644 epan/dissectors/packet-knxip_decrypt.h
delete mode 100644 epan/dissectors/packet-knxnetip.c
create mode 100644 test/captures/knxip_DataSec.pcap
create mode 100644 test/captures/knxip_SecureWrapper.pcap
create mode 100644 test/captures/knxip_TimerNotify.pcap
create mode 100644 test/keys/knx_keyring.xml