diff options
| author | Robert Sauter <sauter@locoslab.com> | 2018-03-07 09:47:09 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-03-08 09:44:18 +0000 |
| commit | e5de1f199499219b297d581d60546f2c5b51a87a (patch) | |
| tree | 4d988f8ef6f086475fba6109dfff6d11e362f2fc /epan/dissectors/packet-ieee802154.h | |
| parent | 3905c0d5d5532d10fa79b0481c9ce01e6752983d (diff) | |
wisun: Netricity segment control and reassembly support
While based on IEEE 802.15.4, the protocol breaks the standard by
having frames where the FCF Security Enabled flag is set but no
Auxiliary Security Header is present. Add handling of this special case
to the IEEE 802.15.4 dissector.
Change-Id: I0e678d5fc999ead740c0c27f51a699559c6cb21a
Reviewed-on: https://code.wireshark.org/review/26336
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ieee802154.h')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee802154.h b/epan/dissectors/packet-ieee802154.h index a9915ba4ba..d3b7ec7222 100644 --- a/epan/dissectors/packet-ieee802154.h +++ b/epan/dissectors/packet-ieee802154.h @@ -480,16 +480,19 @@ proto_tree *ieee802154_create_hie_tree(tvbuff_t *tvb, proto_tree *tree, int hf, proto_tree *ieee802154_create_pie_tree(tvbuff_t *tvb, proto_tree *tree, int hf, gint ett); +/** Even if the FCF Security Enabled flag is set, there is no auxiliary security header present (used by Wi-SUN Netricity) */ +#define IEEE802154_DISSECT_HEADER_OPTION_NO_AUX_SEC_HDR (1 << 1) /** * Dissect the IEEE 802.15.4 header starting from the FCF up to and including the Header IEs (the non-encrypted part) * @param tvb the IEEE 802.15.4 frame * @param pinfo packet info of the currently processed packet * @param tree current protocol tree + * @param options bitmask of IEEE802154_DISSECT_HEADER_OPTION_XX flags * @param[out] created_header_tree will be set to the tree created for the header - * @param[out] parsed_info Will be set to the (wmem allocated) IEEE 802.15.4 packet information + * @param[out] parsed_info will be set to the (wmem allocated) IEEE 802.15.4 packet information * @return the MHR length or 0 if an error occurred */ -guint ieee802154_dissect_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree **created_header_tree, ieee802154_packet **parsed_info); +guint ieee802154_dissect_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint options, proto_tree **created_header_tree, ieee802154_packet **parsed_info); /** * Decrypt the IEEE 802.15.4 payload starting from the Payload IEs |