diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-07-30 02:30:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-07-30 02:30:50 +0000 |
| commit | 11b9ed0426b00dc822d4ab755821f7029b2d821d (patch) | |
| tree | d02aa5f227d6806ed9d8c668ce15087b89566796 /epan/dissectors/packet-ieee802154.c | |
| parent | 9a7e8cdddfab04ae270843ce3e310289b3428ad6 (diff) | |
Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't
include the FCS, and use it for the Daintree SNA file format. While
we're at it, explicitly check to make sure the purported packet length
gives it at least one byte of packet data, and fix some print formats to
use %u for unsigned values.
svn path=/trunk/; revision=33678
Diffstat (limited to 'epan/dissectors/packet-ieee802154.c')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 539e085836..02b3604e7e 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -2564,6 +2564,7 @@ void proto_reg_handoff_ieee802154(void) static gboolean prefs_initialized = FALSE; static dissector_handle_t ieee802154_handle; static dissector_handle_t ieee802154_nonask_phy_handle; + static dissector_handle_t ieee802154_nofcs_handle; static unsigned int old_ieee802154_ethertype; GByteArray *bytes; gboolean res; @@ -2572,10 +2573,12 @@ void proto_reg_handoff_ieee802154(void) /* Get the dissector handles. */ ieee802154_handle = find_dissector("wpan"); ieee802154_nonask_phy_handle = find_dissector("wpan-nonask-phy"); + ieee802154_nofcs_handle = find_dissector("wpan_nofcs"); data_handle = find_dissector("data"); dissector_add("wtap_encap", WTAP_ENCAP_IEEE802_15_4, ieee802154_handle); dissector_add("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NONASK_PHY, ieee802154_nonask_phy_handle); + dissector_add("wtap_encap", WTAP_ENCAP_IEEE802_15_4_NOFCS, ieee802154_nofcs_handle); prefs_initialized = TRUE; } else { |