diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2017-09-19 15:49:06 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-09-19 16:15:58 +0000 |
| commit | 1783a3b7df3b5fae62b40617eda6db8368b1085f (patch) | |
| tree | 70b3be0d73384ce03db17152cbc6127092f8f45b /epan/dissectors/packet-btle.c | |
| parent | 8615e78630e8deace183d150e2c1e5fc60d561ba (diff) | |
btle: Use bd_addr as link-layer address in data PDU
This can be used in a higher layer 6LoWPAN to recreate the source
and destination addresses.
Change-Id: I967c3ac7c3a50526a10bec067521419d0aed8b4f
Reviewed-on: https://code.wireshark.org/review/23616
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-btle.c')
| -rw-r--r-- | epan/dissectors/packet-btle.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index 415adfb05a..ec241d7347 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -928,24 +928,28 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case BTLE_DIR_MASTER_SLAVE: g_snprintf(str_addr_src, str_addr_len, "Master_0x%08x", connection_info->access_address); g_snprintf(str_addr_dst, str_addr_len, "Slave_0x%08x", connection_info->access_address); + set_address(&pinfo->dl_src, AT_ETHER, sizeof(connection_info->master_bd_addr), connection_info->master_bd_addr); + set_address(&pinfo->dl_dst, AT_ETHER, sizeof(connection_info->slave_bd_addr), connection_info->slave_bd_addr); break; case BTLE_DIR_SLAVE_MASTER: g_snprintf(str_addr_src, str_addr_len, "Slave_0x%08x", connection_info->access_address); g_snprintf(str_addr_dst, str_addr_len, "Master_0x%08x", connection_info->access_address); + set_address(&pinfo->dl_src, AT_ETHER, sizeof(connection_info->slave_bd_addr), connection_info->slave_bd_addr); + set_address(&pinfo->dl_dst, AT_ETHER, sizeof(connection_info->master_bd_addr), connection_info->master_bd_addr); break; default: /* BTLE_DIR_UNKNOWN */ g_snprintf(str_addr_src, str_addr_len, "Unknown_0x%08x", connection_info->access_address); g_snprintf(str_addr_dst, str_addr_len, "Unknown_0x%08x", connection_info->access_address); + clear_address(&pinfo->dl_src); + clear_address(&pinfo->dl_dst); break; } set_address(&pinfo->net_src, AT_STRINGZ, (int)strlen(str_addr_src)+1, str_addr_src); - copy_address_shallow(&pinfo->dl_src, &pinfo->net_src); copy_address_shallow(&pinfo->src, &pinfo->net_src); set_address(&pinfo->net_dst, AT_STRINGZ, (int)strlen(str_addr_dst)+1, str_addr_dst); - copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); if (!pinfo->fd->flags.visited) { |