From 313785c51355db51dd846447df0607286e9c1005 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Mon, 15 Nov 2010 20:52:41 +0000 Subject: From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 : The ZigBee security dissector was not recording the short to long address mappings in Security Headers, preventing the decryption of some payloads. This patch eliminates the Undecoded warnings in packets 1 and 19 in this test capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457 The keys to decrypt these packets are listed in the bug. svn path=/trunk/; revision=34886 --- epan/dissectors/packet-zbee-nwk.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'epan/dissectors/packet-zbee-nwk.h') diff --git a/epan/dissectors/packet-zbee-nwk.h b/epan/dissectors/packet-zbee-nwk.h index 9069e83961..19e42d739c 100644 --- a/epan/dissectors/packet-zbee-nwk.h +++ b/epan/dissectors/packet-zbee-nwk.h @@ -164,12 +164,14 @@ typedef struct { typedef struct { gint src_pan; /* source pan */ + gint src; /* short source address from nwk */ gint ieee_src; /* short source address from mac */ ieee802154_map_rec *map_rec; /* extended src from nwk */ key_record_t *nwk; /* Network key found for this packet */ key_record_t *link; /* Link key found for this packet */ } zbee_nwk_hints_t; +extern ieee802154_map_tab_t zbee_nwk_map; extern GHashTable *zbee_table_nwk_keyring; extern GHashTable *zbee_table_link_keyring; -- cgit v1.2.3