Wireshark-commits: [Wireshark-commits] master 0960ac4: Create capture dissector tables.
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 14 Dec 2015 12:17:58 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0960ac4dfdbfba5a81c56a49cfc6201ecd8f48e3 Submitter: Michael Mann (mmann78@xxxxxxxxxxxx) Changed: branch: master Repository: wireshark Commits: 0960ac4 by Michael Mann (mmann78@xxxxxxxxxxxx): Create capture dissector tables. They are modeled after dissection dissector tables, but for the moment, don't have/need the flexibility. They are intended to be much simpler/faster than full dissection. The two most used/needed are "wtap_encap" and "ethertype", so they were the basis of starting to use and test capture dissector table API. Others may be added in the future. The "capture dissector" function signature needed a bit of tweeking to handling "claiming" of a packet. The current application of this is capture functions returning TRUE if they affected a "type" of packet count. Returning FALSE ends up considering the packet an "other" type. Change-Id: I81d06a6ccb2c03665f087258a46b9d78d513d6cd Reviewed-on: https://code.wireshark.org/review/12607 Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx> Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx> Actions performed: from 9319357 PPP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang adds 0960ac4 Create capture dissector tables. Summary of changes: capture_info.c | 3 +- epan/capture_dissectors.c | 71 +++++++++++++++---- epan/capture_dissectors.h | 12 ++-- epan/dissectors/Makefile.common | 3 - epan/dissectors/packet-ap1394.c | 10 ++- epan/dissectors/packet-arcnet.c | 36 +++++----- epan/dissectors/packet-arp.c | 9 +++ epan/dissectors/packet-atalk.c | 11 +-- epan/dissectors/packet-atm.c | 33 +++------ epan/dissectors/packet-ax25-kiss.c | 22 +++--- epan/dissectors/packet-ax25.c | 27 +++---- epan/dissectors/packet-ax25.h | 2 +- epan/dissectors/packet-bpq.c | 12 ++-- epan/dissectors/packet-bpq.h | 30 -------- epan/dissectors/packet-chdlc.c | 21 +++--- epan/dissectors/packet-chdlc.h | 2 +- epan/dissectors/packet-clip.c | 8 +-- epan/dissectors/packet-enc.c | 24 +++---- epan/dissectors/packet-eth.c | 31 ++++---- epan/dissectors/packet-eth.h | 2 +- epan/dissectors/packet-ethertype.c | 51 +------------- epan/dissectors/packet-fddi.c | 23 +++--- epan/dissectors/packet-fr.c | 101 ++++++++++++--------------- epan/dissectors/packet-frame.c | 2 + epan/dissectors/packet-i2c.c | 7 +- epan/dissectors/packet-ieee80211-prism.c | 24 +++---- epan/dissectors/packet-ieee80211-radiotap.c | 38 ++++------ epan/dissectors/packet-ieee80211-wlancap.c | 18 ++--- epan/dissectors/packet-ieee80211.c | 57 +++++++-------- epan/dissectors/packet-ieee80211.h | 6 +- epan/dissectors/packet-ieee8021ah.c | 26 ++++--- epan/dissectors/packet-ieee8021ah.h | 31 -------- epan/dissectors/packet-ip.c | 14 ++-- epan/dissectors/packet-ip.h | 2 +- epan/dissectors/packet-ipfc.c | 14 ++-- epan/dissectors/packet-ipv6.c | 70 +++++++++---------- epan/dissectors/packet-ipv6.h | 2 +- epan/dissectors/packet-ipx.c | 5 +- epan/dissectors/packet-ipx.h | 2 +- epan/dissectors/packet-isl.c | 19 ++--- epan/dissectors/packet-isl.h | 2 +- epan/dissectors/packet-llc.c | 84 +++++++++------------- epan/dissectors/packet-llc.h | 4 +- epan/dissectors/packet-netbios.c | 3 +- epan/dissectors/packet-netbios.h | 2 +- epan/dissectors/packet-netrom.c | 12 ++-- epan/dissectors/packet-netrom.h | 2 +- epan/dissectors/packet-null.c | 59 +++++++--------- epan/dissectors/packet-pktap.c | 35 ++++------ epan/dissectors/packet-ppi.c | 20 ++---- epan/dissectors/packet-ppp.c | 40 +++++------ epan/dissectors/packet-ppp.h | 2 +- epan/dissectors/packet-raw.c | 21 +++--- epan/dissectors/packet-sll.c | 34 ++++----- epan/dissectors/packet-tr.c | 26 +++---- epan/dissectors/packet-tr.h | 2 +- epan/dissectors/packet-vines.c | 6 +- epan/dissectors/packet-vines.h | 2 +- epan/dissectors/packet-vlan.c | 20 +++--- epan/dissectors/packet-vlan.h | 27 ------- epan/packet.h | 3 - 61 files changed, 530 insertions(+), 757 deletions(-) delete mode 100644 epan/dissectors/packet-bpq.h delete mode 100644 epan/dissectors/packet-ieee8021ah.h delete mode 100644 epan/dissectors/packet-vlan.h
- Prev by Date: [Wireshark-commits] master 9319357: PPP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
- Next by Date: [Wireshark-commits] master 1dcfd4e: [PPP] Dissect BCP NCP Options data.
- Previous by thread: [Wireshark-commits] master 9319357: PPP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
- Next by thread: [Wireshark-commits] master 1dcfd4e: [PPP] Dissect BCP NCP Options data.
- Index(es):