diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-08 17:07:25 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-09 01:10:05 +0000 |
| commit | ecaa1f8d21b1284a267ca08d4d698ca99fbcab83 (patch) | |
| tree | 71fb9a61c7c8727f4c5dd4fd1a22f61fe64e928b /epan/dissectors/packet-atalk.c | |
| parent | a2abf8b37fa1bd6595af98ea3233e1306149e27c (diff) | |
convert variables that were static just because of SET_ADDRESS macro to use the proper pinfo->pool instead.
Change-Id: I914918d9629f654ead497dddac0f412b690e4409
Reviewed-on: https://code.wireshark.org/review/6430
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-atalk.c')
| -rw-r--r-- | epan/dissectors/packet-atalk.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index 1b030823a1..18234dd378 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -1437,7 +1437,8 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) e_ddp ddp; proto_tree *ddp_tree; proto_item *ti, *hidden_item; - static struct atalk_ddp_addr src, dst; /* has to be static due to SET_ADDRESS */ + struct atalk_ddp_addr *src = wmem_new(pinfo->pool, struct atalk_ddp_addr), + *dst = wmem_new(pinfo->pool, struct atalk_ddp_addr); tvbuff_t *new_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "DDP"); @@ -1449,14 +1450,14 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ddp.sum=g_ntohs(ddp.sum); ddp.hops_len=g_ntohs(ddp.hops_len); - src.net = ddp.snet; - src.node = ddp.snode; - dst.net = ddp.dnet; - dst.node = ddp.dnode; - SET_ADDRESS(&pinfo->net_src, AT_ATALK, sizeof src, (guint8 *)&src); - SET_ADDRESS(&pinfo->src, AT_ATALK, sizeof src, (guint8 *)&src); - SET_ADDRESS(&pinfo->net_dst, AT_ATALK, sizeof dst, (guint8 *)&dst); - SET_ADDRESS(&pinfo->dst, AT_ATALK, sizeof dst, (guint8 *)&dst); + src->net = ddp.snet; + src->node = ddp.snode; + dst->net = ddp.dnet; + dst->node = ddp.dnode; + SET_ADDRESS(&pinfo->net_src, AT_ATALK, sizeof src, src); + SET_ADDRESS(&pinfo->src, AT_ATALK, sizeof src, src); + SET_ADDRESS(&pinfo->net_dst, AT_ATALK, sizeof dst, dst); + SET_ADDRESS(&pinfo->dst, AT_ATALK, sizeof dst, dst); pinfo->ptype = PT_DDP; pinfo->destport = ddp.dport; @@ -1471,11 +1472,11 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ddp_tree = proto_item_add_subtree(ti, ett_ddp); hidden_item = proto_tree_add_string(ddp_tree, hf_ddp_src, tvb, - 4, 3, atalk_addr_to_str(&src)); + 4, 3, atalk_addr_to_str(src)); PROTO_ITEM_SET_HIDDEN(hidden_item); hidden_item = proto_tree_add_string(ddp_tree, hf_ddp_dst, tvb, - 6, 3, atalk_addr_to_str(&dst)); + 6, 3, atalk_addr_to_str(dst)); PROTO_ITEM_SET_HIDDEN(hidden_item); proto_tree_add_uint(ddp_tree, hf_ddp_hopcount, tvb, 0, 1, |