diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-10 22:07:29 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-10 22:07:29 +0000 |
| commit | b58b5b5c677b6ac8820fa50e1d6685b14700922d (patch) | |
| tree | 5be41b0e25088cd62c7813da2f7441479e78779e /epan/dissectors/packet-ismp.c | |
| parent | 61515ab830dce26a543c8bf529468fe3a0d048da (diff) | |
Pass NULL as the value_ptr to proto_tree_add_bytes_format().
Simplify the code a bit since tvb_ensure_bytes_exist() was already throwing
an exception if all the bytes weren't there.
Use tvb_ether_to_str().
svn path=/trunk/; revision=35904
Diffstat (limited to 'epan/dissectors/packet-ismp.c')
| -rw-r--r-- | epan/dissectors/packet-ismp.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c index 02e74018fb..12d25086ab 100644 --- a/epan/dissectors/packet-ismp.c +++ b/epan/dissectors/packet-ismp.c @@ -357,18 +357,8 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp offset += 2; if (num_neighbors > 0) { - tvb_ensure_bytes_exist(tvb, offset, num_neighbors*10); - if (tvb_reported_length_remaining(tvb, offset) >= (num_neighbors *10)) - { - edp_neighbors_ti = proto_tree_add_bytes_format(edp_tree, hf_ismp_edp_neighbors, tvb, - offset, num_neighbors*10, tvb_get_ptr(tvb, offset, (num_neighbors*10)), "Neighbors:"); - } - else - { - edp_neighbors_ti = proto_tree_add_bytes_format(edp_tree, hf_ismp_edp_neighbors, tvb, - offset, num_neighbors *10, - tvb_get_ptr(tvb, offset, tvb_reported_length_remaining(tvb, offset)), "Neighbors:"); - } + edp_neighbors_ti = proto_tree_add_bytes_format(edp_tree, hf_ismp_edp_neighbors, tvb, + offset, num_neighbors*10, NULL, "Neighbors:"); edp_neighbors_tree = proto_item_add_subtree(edp_neighbors_ti, ett_ismp_edp_neighbors); while ( neighbors_count < num_neighbors && tvb_reported_length_remaining(tvb, offset) >= 10) { @@ -377,9 +367,9 @@ dissect_ismp_edp(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *ismp edp_neighbors_leaf_tree = proto_item_add_subtree(edp_neighbors_leaf_ti, ett_ismp_edp_neighbors_leaf); proto_tree_add_text(edp_neighbors_leaf_tree, tvb, offset, 6, - "MAC Address: %s", ether_to_str(tvb_get_ptr(tvb, offset, 6))); + "MAC Address: %s", tvb_ether_to_str(tvb, offset)); proto_tree_add_text(edp_neighbors_leaf_tree, tvb, offset, 4, - "Assigned Neighbor State 0x%04x",tvb_get_ntohl(tvb, offset)); + "Assigned Neighbor State 0x%04x", tvb_get_ntohl(tvb, offset)); offset += 10; neighbors_count++; } |