diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-10-26 05:42:24 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-10-26 05:42:24 +0000 |
| commit | 26f0f7bc7a921b2096ae13544e04cc900efbad33 (patch) | |
| tree | cf0b7371cfeaf8b1326cd86baf39beba169b5efa /epan/dissectors/packet-6lowpan.c | |
| parent | 161076b23bfedde54994776f77d2716c9dc2e916 (diff) | |
| download | wireshark-26f0f7bc7a921b2096ae13544e04cc900efbad33.tar.gz wireshark-26f0f7bc7a921b2096ae13544e04cc900efbad33.tar.bz2 wireshark-26f0f7bc7a921b2096ae13544e04cc900efbad33.zip | |
From Fred Fierling:
Multi-key Support and Extended Address Mapping for ZigBee Dissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331
svn path=/trunk/; revision=34647
Diffstat (limited to 'epan/dissectors/packet-6lowpan.c')
| -rw-r--r-- | epan/dissectors/packet-6lowpan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index f2525b0e3b..7cd4054bdb 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -516,14 +516,14 @@ lowpan_dlsrc_to_ifcid(packet_info *pinfo, guint8 *ifcid) /* Derive the IID from the IEEE 802.15.4 packet structure. */ if (packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT) { guint64 addr; - addr = pntoh64(&packet->src.addr64); + addr = pntoh64(&packet->src64); memcpy(ifcid, &addr, LOWPAN_IFC_ID_LEN); /* RFC2464: Invert the U/L bit when using an EUI64 address. */ ifcid[0] ^= 0x02; return TRUE; } if (packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) { - lowpan_addr16_to_ifcid(packet->src.addr16, ifcid); + lowpan_addr16_to_ifcid(packet->src16, ifcid); return TRUE; } @@ -561,14 +561,14 @@ lowpan_dldst_to_ifcid(packet_info *pinfo, guint8 *ifcid) /* Derive the IID from the IEEE 802.15.4 packet structure. */ if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_EXT) { guint64 addr; - addr = pntoh64(&packet->dst.addr64); + addr = pntoh64(&packet->dst64); memcpy(ifcid, &addr, LOWPAN_IFC_ID_LEN); /* RFC2464: Invert the U/L bit when using an EUI64 address. */ ifcid[0] ^= 0x02; return TRUE; } if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) { - lowpan_addr16_to_ifcid(packet->dst.addr16, ifcid); + lowpan_addr16_to_ifcid(packet->dst16, ifcid); return TRUE; } |