diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-16 03:29:03 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-16 03:29:03 +0000 |
| commit | 067a0761790aabf2d6a829c59dbdac4c2d0fccdf (patch) | |
| tree | ee4e7efac0f2d4a12f25d92b0b1fd222f1e47587 /epan/dissectors/packet-dec-dnart.c | |
| parent | 1f19cd8f1b95aa5cfef763d266724e01a1c579e2 (diff) | |
Use tvb_ip_to_str().
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().
Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.
svn path=/trunk/; revision=35545
Diffstat (limited to 'epan/dissectors/packet-dec-dnart.c')
| -rw-r--r-- | epan/dissectors/packet-dec-dnart.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index a9b8e62eaf..439ec02075 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -602,9 +602,8 @@ do_initialization_msg( my_offset += 2; remainder_count = tvb_get_guint8(tvb, my_offset); if (remainder_count != 0) { - proto_tree_add_bytes(tree, hf_dec_rt_reserved, tvb, - my_offset, remainder_count, - tvb_get_ptr(tvb, my_offset, remainder_count)); + proto_tree_add_item(tree, hf_dec_rt_reserved, tvb, + my_offset, remainder_count, ENC_NA); my_offset += remainder_count; } return (my_offset); @@ -626,9 +625,8 @@ do_verification_msg( offset += 2; remainder_count = tvb_get_guint8(tvb, my_offset); if (remainder_count != 0) { - proto_tree_add_bytes(tree, hf_dec_rt_fcnval, tvb, - my_offset, remainder_count, - tvb_get_ptr(tvb, my_offset, remainder_count)); + proto_tree_add_item(tree, hf_dec_rt_fcnval, tvb, + my_offset, remainder_count, ENC_NA); my_offset += remainder_count; } return (my_offset); @@ -650,9 +648,8 @@ do_hello_test_msg( my_offset += 2; remainder_count = tvb_length_remaining(tvb, my_offset); if (remainder_count != 0) { - proto_tree_add_bytes(tree, hf_dec_rt_test_data, tvb, - my_offset, remainder_count, - tvb_get_ptr(tvb, my_offset, remainder_count)); + proto_tree_add_item(tree, hf_dec_rt_test_data, tvb, + my_offset, remainder_count, ENC_NA); my_offset += remainder_count; } return (my_offset); @@ -824,8 +821,8 @@ do_hello_msg( tvb, my_offset, 1, "Router States"); list_tree = proto_item_add_subtree(ti_locala, ett_dec_rt_list); while (image_len > 0) { - ti_ether = proto_tree_add_bytes(list_tree, hf_dec_rt_ename, tvb, - my_offset, 7, tvb_get_ptr(tvb, my_offset, 7)); + ti_ether = proto_tree_add_item(list_tree, hf_dec_rt_ename, tvb, + my_offset, 7, ENC_NA); list_ether = proto_item_add_subtree(ti_ether, ett_dec_rt_rlist); my_offset += 7; image_len -= 7; |