diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-10 16:31:00 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-10 16:31:00 +0000 |
| commit | 50e1634f4ccfc3efeb6d0c6c452f9b4070a960e0 (patch) | |
| tree | 72d5f556239cdd05d77fbf05fdc389d22316d8e5 /epan/dissectors/packet-ssl.c | |
| parent | 7154ed56896eefff35426215eb98db8ea6d4f31a (diff) | |
Modify proto_tree_add_bytes_format() and proto_tree_add_bytes_format_value()
so that if the start_ptr is NULL the bytes are extracted from the given TVB
using the given offset and length.
Replace a bunch of:
proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), [...])
with:
proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, NULL, [...])
svn path=/trunk/; revision=35896
Diffstat (limited to 'epan/dissectors/packet-ssl.c')
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 4107398dcf..f82b844e99 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -2113,8 +2113,7 @@ dissect_ssl3_hnd_hello_ext(tvbuff_t *tvb, break; default: proto_tree_add_bytes_format(ext_tree, hf_ssl_handshake_extension_data, - tvb, offset, ext_len, - tvb_get_ptr(tvb, offset, ext_len), + tvb, offset, ext_len, NULL, "Data (%u byte%s)", ext_len, plurality(ext_len, "", "s")); offset += ext_len; @@ -3164,8 +3163,7 @@ dissect_ssl2_hnd_client_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_bytes_format(tree, hf_ssl_handshake_session_id, tvb, offset, session_id_length, - tvb_get_ptr(tvb, offset, session_id_length), - "Session ID (%u byte%s)", + NULL, "Session ID (%u byte%s)", session_id_length, plurality(session_id_length, "", "s")); } |