diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-04-09 05:53:14 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-04-09 05:53:14 +0000 |
| commit | 90e55db489b40d728fce39ec35de4cfccfa4915d (patch) | |
| tree | aa375a7a184c0a99b9ce6d4dc29985810e62349a /epan/dissectors/packet-ndmp.c | |
| parent | caa4281da4f06f148a598eb0faec6e944d03abb1 (diff) | |
From Chris Costa:
Patch for NDMP tape_get_state dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3394
svn path=/trunk/; revision=28018
Diffstat (limited to 'epan/dissectors/packet-ndmp.c')
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index aec552c791..7c44901f33 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -1408,32 +1408,32 @@ dissect_tape_open_request(tvbuff_t *tvb, int offset, packet_info *pinfo, static const true_false_string tfs_ndmp_tape_invalid_file_num = { - "File num is valid", - "File num is INVALID" + "File num is INVALID", + "File num is VALID" }; static const true_false_string tfs_ndmp_tape_invalid_soft_errors = { - "Soft errors is valid", - "Soft errors is INVALID" + "Soft errors is INVALID", + "Soft errors is VALID" }; static const true_false_string tfs_ndmp_tape_invalid_block_size = { - "Block size is valid", - "Block size is INVALID" + "Block size is INVALID", + "Block size is VALID" }; static const true_false_string tfs_ndmp_tape_invalid_block_no = { - "Block no is valid", - "Block no is INVALID" + "Block no is INVALID", + "Block no is VALID" }; static const true_false_string tfs_ndmp_tape_invalid_total_space = { - "Total space is valid", - "Total space is INVALID" + "Total space is INVALID", + "Total space is VALID" }; static const true_false_string tfs_ndmp_tape_invalid_space_remain = { "Space remaining is INVALID", - "Space remaining is valid" + "Space remaining is VALID" }; static const true_false_string tfs_ndmp_tape_invalid_partition = { "Partition is INVALID", - "Partition is valid" + "Partition is VALID" }; static int dissect_tape_invalid(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, @@ -1551,6 +1551,10 @@ dissect_tape_get_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, offset = dissect_rpc_uint64(tvb, tree,hf_ndmp_tape_space_remain, offset); + /* NDMP Version 4 does not have a partition field here, so just return now. */ + if (get_ndmp_protocol_version(ndmp_conv_data) == NDMP_PROTOCOL_V4) + return offset; + /* partition */ proto_tree_add_item(tree, hf_ndmp_tape_partition, tvb, offset, 4, FALSE); offset += 4; |