diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-10-20 08:42:01 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-23 00:16:49 +0000 |
| commit | c7770e9e5637bb6c1fc57784196da384ad6e7735 (patch) | |
| tree | 914ba23d8702dcd909887cfa1e006c325354cad3 /epan/dissectors/packet-tds.c | |
| parent | 16906c5f0aa6e3aeb567c768ec0fd586e5bd1f22 (diff) | |
| download | wireshark-c7770e9e5637bb6c1fc57784196da384ad6e7735.tar.gz | |
TDS: Use hf_tds_prelogin field
Change-Id: I06a87dbc402b5b96910f73402d44ed30118c9d23
Reviewed-on: https://code.wireshark.org/review/11172
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-tds.c')
| -rw-r--r-- | epan/dissectors/packet-tds.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 3313c6ba85..119f6b8063 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -1467,16 +1467,17 @@ dissect_tds7_prelogin_packet(tvbuff_t *tvb, proto_tree *tree) gint offset = 0; guint16 tokenoffset, tokenlen; proto_tree *prelogin_tree = NULL, *option_tree; - proto_item * ti; + proto_item *ti, *item; + + item = proto_tree_add_item(tree, hf_tds_prelogin, tvb, 0, -1, ENC_NA); if(detect_tls(tvb)) { - proto_tree_add_subtree(tree, tvb, offset, -1, ett_tds7_prelogin, NULL, "TDS Pre-Login Packet - TLS exchange"); + proto_item_append_text(item, " - TLS exchange"); return; } - prelogin_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_tds7_prelogin, NULL, "TDS Pre-Login Packet"); - + prelogin_tree = proto_item_add_subtree(item, ett_tds_message); while(tvb_reported_length_remaining(tvb, offset) > 0) { token = tvb_get_guint8(tvb, offset); @@ -3784,7 +3785,8 @@ dissect_netlib_buffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(detect_tls(tvb)) { - proto_tree_add_subtree(tree, tvb, offset, -1, ett_tds7_prelogin, NULL, "TDS Pre-Login Packet - TLS exchange"); + tds_item = proto_tree_add_item(tree, hf_tds_prelogin, tvb, 0, -1, ENC_NA); + proto_item_append_text(tds_item, " - TLS exchange"); return; } |