diff options
| author | Chris Bontje <cbontje@gmail.com> | 2017-06-20 14:15:31 -0600 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-06-22 15:21:13 +0000 |
| commit | a4694da19f8e58ee6f5a51e2b59645b38fbdce1a (patch) | |
| tree | 95dd7961852cdea6d6a818c2007011317758b1d5 | |
| parent | 61d2f5e6c0215d3e50c8a852f9bc2b72016740ae (diff) | |
| download | wireshark-a4694da19f8e58ee6f5a51e2b59645b38fbdce1a.tar.gz | |
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 <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 130b514be216e8ccc42c6831f62ecb23e9b83917)
Reviewed-on: https://code.wireshark.org/review/22351
| -rw-r--r-- | epan/dissectors/packet-mbtcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
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.*/ |