diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-26 22:03:12 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-03-01 12:54:33 +0000 |
| commit | 9c55903029ee0e6720597ef07e8a5b359cae068e (patch) | |
| tree | 251dddfa5de23777e225e128529b00a7a0143b76 /epan/dissectors/packet-batadv.c | |
| parent | 5f2c8e9575eb6afb6c645d43a015cff035fcbeb0 (diff) | |
Use COPY_ADDRESS_SHALLOW instead of duplicating TVB_SET_ADDRESS and SET_ADDRESS calls for the same address.
Change-Id: I0c9cc5d574fdd73ecf1f8b32dbbf0ddb2b885116
Reviewed-on: https://code.wireshark.org/review/7437
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-batadv.c')
| -rw-r--r-- | epan/dissectors/packet-batadv.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index ed0ef72732..c40f525296 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -2362,16 +2362,16 @@ static void dissect_batadv_icmp_v15(tvbuff_t *tvb, packet_info *pinfo, offset += 1; TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dst, AT_ETHER, tvb, offset, 6); + COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &icmp_packeth->dst); + COPY_ADDRESS_SHALLOW(&pinfo->dst, &icmp_packeth->dst); proto_tree_add_item(batadv_icmp_tree, hf_batadv_icmp_dst, tvb, offset, 6, ENC_NA); offset += 6; TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, offset, 6); + COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &icmp_packeth->orig); + COPY_ADDRESS_SHALLOW(&pinfo->src, &icmp_packeth->orig); proto_tree_add_item(batadv_icmp_tree, hf_batadv_icmp_orig, tvb, offset, 6, ENC_NA); offset += 6; @@ -2946,15 +2946,15 @@ static void dissect_batadv_unicast_frag_v15(tvbuff_t *tvb, packet_info *pinfo, offset += 1; TVB_SET_ADDRESS(&unicast_frag_packeth->dest, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dst, AT_ETHER, tvb, offset, 6); + COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_frag_packeth->dest); + COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_frag_packeth->dest); proto_tree_add_item(batadv_unicast_frag_tree, hf_batadv_unicast_frag_dst, tvb, offset, 6, ENC_NA); offset += 6; TVB_SET_ADDRESS(&unicast_frag_packeth->orig, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, offset, 6); + COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_frag_packeth->orig); + COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_frag_packeth->orig); proto_tree_add_item(batadv_unicast_frag_tree, hf_batadv_unicast_frag_orig, tvb, offset, 6, ENC_NA); offset += 6; @@ -3685,15 +3685,15 @@ static void dissect_batadv_coded_v15(tvbuff_t *tvb, packet_info *pinfo, offset += 1; TVB_SET_ADDRESS(&coded_packeth->first_source, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, offset, 6); + COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &coded_packeth->first_source); + COPY_ADDRESS_SHALLOW(&pinfo->src, &coded_packeth->first_source); proto_tree_add_item(batadv_coded_tree, hf_batadv_coded_first_source, tvb, offset, 6, ENC_NA); offset += 6; TVB_SET_ADDRESS(&coded_packeth->first_orig_dest, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dst, AT_ETHER, tvb, offset, 6); + COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &coded_packeth->first_orig_dest); + COPY_ADDRESS_SHALLOW(&pinfo->dst, &coded_packeth->first_orig_dest); proto_tree_add_item(batadv_coded_tree, hf_batadv_coded_first_orig_dest, tvb, offset, 6, ENC_NA); offset += 6; @@ -3826,15 +3826,15 @@ static void dissect_batadv_unicast_tvlv_v15(tvbuff_t *tvb, packet_info *pinfo, offset += 1; TVB_SET_ADDRESS(&unicast_tvlv_packeth->dest, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dst, AT_ETHER, tvb, offset, 6); + COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_tvlv_packeth->dest); + COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_tvlv_packeth->dest); proto_tree_add_item(batadv_unicast_tvlv_tree, hf_batadv_unicast_tvlv_dst, tvb, offset, 6, ENC_NA); offset += 6; TVB_SET_ADDRESS(&unicast_tvlv_packeth->src, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, offset, 6); + COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_tvlv_packeth->src); + COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_tvlv_packeth->src); proto_tree_add_item(batadv_unicast_tvlv_tree, hf_batadv_unicast_tvlv_src, tvb, offset, 6, ENC_NA); offset += 6; |