Wireshark-commits: [Wireshark-commits] master 56aa052: Create a way to register "capture" dissector
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 13 Dec 2015 14:34:21 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=56aa05227f6bc18211d9ddec669af77ba5cd78e9 Submitter: Michael Mann (mmann78@xxxxxxxxxxxx) Changed: branch: master Repository: wireshark Commits: 56aa052 by Michael Mann (mmann78@xxxxxxxxxxxx): Create a way to register "capture" dissectors. Capture dissectors could be architected like dissection dissectors, with tables and subtables and possibly using tvbs to pass there data instead of raw byte arrays. This is a first step towards that by refactoring capture_info_packet() to work off of a "capture dissector table" Registering the capture dissection functions instead of calling them directly also clears up a bunch of dissector header files who sole purpose was providing the capture dissection function definition. Change-Id: I10e9b79e061f32d2572f009823601d4f048d37aa Reviewed-on: https://code.wireshark.org/review/12581 Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx> Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx> Actions performed: from 23379ae NBAP : Verify conversation proto data exists before trying to access it adds 56aa052 Create a way to register "capture" dissectors. Summary of changes: capture_info.c | 119 +--------------------- debian/libwireshark0.symbols | 26 ----- epan/CMakeLists.txt | 1 + epan/Makefile.common | 2 + epan/capture_dissectors.c | 85 ++++++++++++++++ wsutil/cmdarg_err.h => epan/capture_dissectors.h | 43 ++++---- epan/dissectors/Makefile.common | 14 --- epan/dissectors/packet-ap1394.c | 8 +- epan/dissectors/packet-ap1394.h | 30 ------ epan/dissectors/packet-arcnet.c | 24 +++-- epan/dissectors/packet-arcnet.h | 30 ------ epan/dissectors/packet-atalk.c | 7 +- epan/dissectors/packet-atalk.h | 4 - epan/dissectors/packet-atm.c | 15 +-- epan/dissectors/packet-atm.h | 6 -- epan/dissectors/packet-ax25-kiss.c | 12 ++- epan/dissectors/packet-ax25-kiss.h | 33 ------ epan/dissectors/packet-ax25.c | 5 +- epan/dissectors/packet-ax25.h | 6 +- epan/dissectors/packet-bpq.c | 4 +- epan/dissectors/packet-bpq.h | 2 +- epan/dissectors/packet-chdlc.c | 5 +- epan/dissectors/packet-chdlc.h | 6 +- epan/dissectors/packet-clip.c | 10 +- epan/dissectors/packet-clip.h | 30 ------ epan/dissectors/packet-enc.c | 8 +- epan/dissectors/packet-enc.h | 30 ------ epan/dissectors/packet-eth.c | 8 +- epan/dissectors/packet-eth.h | 6 +- epan/dissectors/packet-ethertype.c | 4 +- epan/dissectors/packet-fddi.c | 19 +++- epan/dissectors/packet-fddi.h | 36 ------- epan/dissectors/packet-fr.c | 12 ++- epan/dissectors/packet-fr.h | 30 ------ epan/dissectors/packet-i2c.c | 9 +- epan/dissectors/packet-i2c.h | 30 ------ epan/dissectors/packet-ieee80211-prism.c | 11 +- epan/dissectors/packet-ieee80211-radiotap.c | 21 +++- epan/dissectors/packet-ieee80211-radiotap.h | 46 --------- epan/dissectors/packet-ieee80211-wlancap.c | 6 +- epan/dissectors/packet-ieee80211.c | 10 +- epan/dissectors/packet-ieee80211.h | 10 +- epan/dissectors/packet-ieee8021ah.c | 2 +- epan/dissectors/packet-ipfc.c | 10 +- epan/dissectors/packet-ipfc.h | 30 ------ epan/dissectors/packet-isl.c | 6 +- epan/dissectors/packet-isl.h | 2 +- epan/dissectors/packet-llc.c | 2 +- epan/dissectors/packet-llc.h | 2 +- epan/dissectors/packet-null.c | 15 +-- epan/dissectors/packet-null.h | 33 ------ epan/dissectors/packet-pktap.c | 15 ++- epan/dissectors/packet-pktap.h | 30 ------ epan/dissectors/packet-ppi.c | 11 +- epan/dissectors/packet-ppi.h | 30 ------ epan/dissectors/packet-ppp.c | 7 +- epan/dissectors/packet-ppp.h | 4 +- epan/dissectors/packet-raw.c | 14 +-- epan/dissectors/packet-raw.h | 30 ------ epan/dissectors/packet-sll.c | 13 ++- epan/dissectors/packet-sll.h | 3 - epan/dissectors/packet-tr.c | 6 +- epan/dissectors/packet-tr.h | 4 +- epan/dissectors/packet-vlan.c | 2 +- epan/epan.c | 3 + epan/wslua/taps | 1 - tools/delete_includes.py | 12 --- 67 files changed, 323 insertions(+), 787 deletions(-) create mode 100644 epan/capture_dissectors.c copy wsutil/cmdarg_err.h => epan/capture_dissectors.h (54%) delete mode 100644 epan/dissectors/packet-ap1394.h delete mode 100644 epan/dissectors/packet-arcnet.h delete mode 100644 epan/dissectors/packet-ax25-kiss.h delete mode 100644 epan/dissectors/packet-clip.h delete mode 100644 epan/dissectors/packet-enc.h delete mode 100644 epan/dissectors/packet-fddi.h delete mode 100644 epan/dissectors/packet-fr.h delete mode 100644 epan/dissectors/packet-i2c.h delete mode 100644 epan/dissectors/packet-ieee80211-radiotap.h delete mode 100644 epan/dissectors/packet-ipfc.h delete mode 100644 epan/dissectors/packet-null.h delete mode 100644 epan/dissectors/packet-pktap.h delete mode 100644 epan/dissectors/packet-ppi.h delete mode 100644 epan/dissectors/packet-raw.h
- Prev by Date: [Wireshark-commits] master-1.12 884d49c: NBAP : Verify conversation proto data exists before trying to access it
- Next by Date: [Wireshark-commits] buildbot failure in Wireshark (development) on Ubuntu 14.04 x64
- Previous by thread: [Wireshark-commits] master-1.12 884d49c: NBAP : Verify conversation proto data exists before trying to access it
- Next by thread: [Wireshark-commits] master 9fcf004: [Automatic update for 2015-12-13]
- Index(es):