From a4694da19f8e58ee6f5a51e2b59645b38fbdce1a Mon Sep 17 00:00:00 2001 From: Chris Bontje Date: Tue, 20 Jun 2017 14:15:31 -0600 Subject: packet-mbtcp - Fix retrieval of Holding/Input Register Format Preference Change-Id: I7a6a409df5c977db1898aec6a47ae3dd8427a00c Reviewed-on: https://code.wireshark.org/review/22286 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin (cherry picked from commit 130b514be216e8ccc42c6831f62ecb23e9b83917) Reviewed-on: https://code.wireshark.org/review/22351 --- epan/dissectors/packet-mbtcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index 4ac8a9f014..211a05af6e 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -1561,10 +1561,10 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) modbus_conv_data = wmem_new(wmem_file_scope(), modbus_conversation); modbus_conv_data->modbus_request_frame_data = wmem_list_new(wmem_file_scope()); modbus_conv_data->register_format = global_mbus_register_format; - pkt_info->register_format = global_mbus_register_format; conversation_add_proto_data(conversation, proto_modbus, (void *)modbus_conv_data); } + pkt_info->register_format = modbus_conv_data->register_format; if (*packet_type == QUERY_PACKET) { /*create the modbus_request frame. It holds the request information.*/ -- cgit v1.2.1