diff options
| author | João Valverde <j@v6e.pt> | 2016-02-08 00:43:56 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-02-08 00:44:22 +0000 |
| commit | ef929dc8eb8c61d5829132d2da2a3061df44bba9 (patch) | |
| tree | 6dc7fb0abec832c1b336580bfeaec70717f0a76f /epan/dissectors/packet-openflow_v5.c | |
| parent | 8df2857bc1082797cc7052eb5a6ebb45ac92e4b9 (diff) | |
Revert "Add free_address_wmem() and other extensions to address API"
This reverts commit 13ec77a9fc3af3b0b502820d0b55796c89997896.
This commit introduces a segmentation fault for Lua code (uncovered by the test suite).
Change-Id: Ibc273d1915cda9632697b9f138f0ae104d3fb65e
Reviewed-on: https://code.wireshark.org/review/13813
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/dissectors/packet-openflow_v5.c')
| -rw-r--r-- | epan/dissectors/packet-openflow_v5.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/epan/dissectors/packet-openflow_v5.c b/epan/dissectors/packet-openflow_v5.c index 7e12a42eab..b3c69e49e1 100644 --- a/epan/dissectors/packet-openflow_v5.c +++ b/epan/dissectors/packet-openflow_v5.c @@ -2050,12 +2050,12 @@ dissect_openflow_packet_in_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree /* save some state */ save_writable = col_get_writable(pinfo->cinfo); save_in_error_pkt = pinfo->flags.in_error_pkt; - copy_address_shallow(&save_dl_src, &pinfo->dl_src); - copy_address_shallow(&save_dl_dst, &pinfo->dl_dst); - copy_address_shallow(&save_net_src, &pinfo->net_src); - copy_address_shallow(&save_net_dst, &pinfo->net_dst); - copy_address_shallow(&save_src, &pinfo->src); - copy_address_shallow(&save_dst, &pinfo->dst); + save_dl_src = pinfo->dl_src; + save_dl_dst = pinfo->dl_dst; + save_net_src = pinfo->net_src; + save_net_dst = pinfo->net_dst; + save_src = pinfo->src; + save_dst = pinfo->dst; /* dissect data */ col_set_writable(pinfo->cinfo, FALSE); @@ -2065,12 +2065,12 @@ dissect_openflow_packet_in_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree /* restore saved state */ col_set_writable(pinfo->cinfo, save_writable); pinfo->flags.in_error_pkt = save_in_error_pkt; - copy_address_shallow(&pinfo->dl_src, &save_dl_src); - copy_address_shallow(&pinfo->dl_dst, &save_dl_dst); - copy_address_shallow(&pinfo->net_src, &save_net_src); - copy_address_shallow(&pinfo->net_dst, &save_net_dst); - copy_address_shallow(&pinfo->src, &save_src); - copy_address_shallow(&pinfo->dst, &save_dst); + pinfo->dl_src = save_dl_src; + pinfo->dl_dst = save_dl_dst; + pinfo->net_src = save_net_src; + pinfo->net_dst = save_net_dst; + pinfo->src = save_src; + pinfo->dst = save_dst; } } @@ -2789,12 +2789,12 @@ dissect_openflow_packet_out_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree /* save some state */ save_writable = col_get_writable(pinfo->cinfo); save_in_error_pkt = pinfo->flags.in_error_pkt; - copy_address_shallow(&save_dl_src, &pinfo->dl_src); - copy_address_shallow(&save_dl_dst, &pinfo->dl_dst); - copy_address_shallow(&save_net_src, &pinfo->net_src); - copy_address_shallow(&save_net_dst, &pinfo->net_dst); - copy_address_shallow(&save_src, &pinfo->src); - copy_address_shallow(&save_dst, &pinfo->dst); + save_dl_src = pinfo->dl_src; + save_dl_dst = pinfo->dl_dst; + save_net_src = pinfo->net_src; + save_net_dst = pinfo->net_dst; + save_src = pinfo->src; + save_dst = pinfo->dst; /* dissect data */ col_set_writable(pinfo->cinfo, FALSE); @@ -2804,12 +2804,12 @@ dissect_openflow_packet_out_v5(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree /* restore saved state */ col_set_writable(pinfo->cinfo, save_writable); pinfo->flags.in_error_pkt = save_in_error_pkt; - copy_address_shallow(&pinfo->dl_src, &save_dl_src); - copy_address_shallow(&pinfo->dl_dst, &save_dl_dst); - copy_address_shallow(&pinfo->net_src, &save_net_src); - copy_address_shallow(&pinfo->net_dst, &save_net_dst); - copy_address_shallow(&pinfo->src, &save_src); - copy_address_shallow(&pinfo->dst, &save_dst); + pinfo->dl_src = save_dl_src; + pinfo->dl_dst = save_dl_dst; + pinfo->net_src = save_net_src; + pinfo->net_dst = save_net_dst; + pinfo->src = save_src; + pinfo->dst = save_dst; } } |