osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Tweak ZigBee GreenPower heuristic to more closely match ZigBee NWK heuristic. Bug 9956 

Change-Id: I2c4d26ee27684d1f18c39add249b9cd116cf6f71
Reviewed-on: https://code.wireshark.org/review/985
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Michael Mann 2014-04-06 13:38:11 -04:00 committed by Alexis La Goutte
parent 4eaec3cc78
commit f06cdf3a83
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/dissectors/packet-zbee-nwk-gp.c
View File

@ -1423,26 +1423,26 @@ dissect_zbee_nwk_heur_gp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo
{
ieee802154_packet *packet = (ieee802154_packet *)data;
/* All ZigBee frames must always have a 16-bit source address. */
if ( (packet == NULL) ||
(packet->src_addr_mode != IEEE802154_FCF_ADDR_SHORT) ) {
return FALSE;
}
/* Skip ZigBee beacons. */
if ((packet->frame_type == IEEE802154_FCF_BEACON) && (tvb_get_guint8(tvb, 0) == ZBEE_NWK_BEACON_PROCOL_ID))
return FALSE;
if (packet->dst_pan == IEEE802154_BCAST_PAN && packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT &&
packet->dst16 == IEEE802154_BCAST_ADDR && packet->frame_type != IEEE802154_FCF_BEACON &&
packet->src_addr_mode != IEEE802154_FCF_ADDR_SHORT) {
packet->dst16 == IEEE802154_BCAST_ADDR && packet->frame_type != IEEE802154_FCF_BEACON) {
dissect_zbee_nwk_gp(tvb, pinfo, tree, data);
return TRUE;
}
/* 64-bit destination addressing mode support. */
if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT && packet->frame_type != IEEE802154_FCF_BEACON &&
packet->src_addr_mode != IEEE802154_FCF_ADDR_SHORT) {
if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT && packet->frame_type != IEEE802154_FCF_BEACON) {
dissect_zbee_nwk_gp(tvb, pinfo, tree, data);
return TRUE;
}
/* All ZigBee 2006, 2007 and PRO frames must always have a 16-bit source address. */
if (packet->src_addr_mode != IEEE802154_FCF_ADDR_SHORT) {
return TRUE;
}
return FALSE;
} /* dissect_zbee_nwk_heur_gp */