diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-10-27 15:42:45 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-10-27 16:56:48 +0000 |
| commit | 78fee11f4b9a253cfb65d3f4e60aee3acf59ba58 (patch) | |
| tree | 35ffaa5781900f7baaf9b6a7171de58598c1565c | |
| parent | 488ca3323adcaa46727170770acb6600015a9cc4 (diff) | |
| download | wireshark-78fee11f4b9a253cfb65d3f4e60aee3acf59ba58.tar.gz | |
GVCP: do not try to append register value to info column when READREG_ACK has an error status
Bug: 11639
Change-Id: I1389b74092138e3b28cf4f0dd2d2c8967ec8ba12
Reviewed-on: https://code.wireshark.org/review/11310
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 4f22e9937f72a43e53262d0ca3297f686109f4c4)
Reviewed-on: https://code.wireshark.org/review/11314
| -rw-r--r-- | epan/dissectors/packet-gvcp.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index 83524979be..04a16fd0a9 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -1952,7 +1952,14 @@ static void dissect_readreg_ack(proto_tree *gvcp_telegram_tree, tvbuff_t *tvb, p address_string = get_register_name_from_address(*((guint32*)wmem_array_index(gvcp_trans->addr_list, 0)), &is_custom_register); } - col_append_fstr(pinfo->cinfo, COL_INFO, "%s Value=0x%08X", address_string, tvb_get_ntohl(tvb, offset)); + if (num_registers) + { + col_append_fstr(pinfo->cinfo, COL_INFO, "%s Value=0x%08X", address_string, tvb_get_ntohl(tvb, offset)); + } + else + { + col_append_fstr(pinfo->cinfo, COL_INFO, "%s", address_string); + } } } |