From 43cb273d08e3d2e9f5526adcd9acf7cce2dd88f8 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Sun, 24 Oct 2010 10:04:29 +0000 Subject: 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=34627 --- epan/dissectors/packet-6lowpan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-6lowpan.c') 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; } -- cgit v1.2.3