Fixed Zigbee NWK GP dissector heuristics
Heuristics should not filter out packets that have destinationPAN ID != IEEE802154_BCAST_PAN, since GPD frames MAY inform PAN ID - GPD spec v1.1.1 section A.1.7.1.2 MAC addressing fields
This commit is contained in:
parent
cd33794373
commit
e967a3ecc3
|
@ -1909,8 +1909,7 @@ dissect_zbee_nwk_heur_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
|
||||||
if (!try_val_to_str(zbee_get_bit_field(fcf, ZBEE_NWK_FCF_FRAME_TYPE), zbee_nwk_gp_frame_types)) return FALSE;
|
if (!try_val_to_str(zbee_get_bit_field(fcf, ZBEE_NWK_FCF_FRAME_TYPE), zbee_nwk_gp_frame_types)) return FALSE;
|
||||||
|
|
||||||
/* ZigBee greenpower frames are either sent to broadcast or the extended address. */
|
/* ZigBee greenpower frames are either sent to broadcast or the extended address. */
|
||||||
if (packet->dst_pan == IEEE802154_BCAST_PAN && packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT &&
|
if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT && packet->dst16 == IEEE802154_BCAST_ADDR) {
|
||||||
packet->dst16 == IEEE802154_BCAST_ADDR) {
|
|
||||||
dissect_zbee_nwk_gp(tvb, pinfo, tree, data);
|
dissect_zbee_nwk_gp(tvb, pinfo, tree, data);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue