diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
| commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
| tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-negoex.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96.
Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-negoex.c')
| -rw-r--r-- | epan/dissectors/packet-negoex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-negoex.c b/epan/dissectors/packet-negoex.c index 9ed88cc5eb..7c3f2cc76e 100644 --- a/epan/dissectors/packet-negoex.c +++ b/epan/dissectors/packet-negoex.c @@ -134,7 +134,7 @@ dissect_negoex_alert_message(tvbuff_t *tvb, offset += 4; /* The rest */ - proto_tree_add_text(tree, tvb, offset, tvb_captured_length(tvb) - offset, + proto_tree_add_text(tree, tvb, offset, tvb_length(tvb) - offset, "The rest of the alert message"); } @@ -366,7 +366,7 @@ dissect_negoex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) negoex_tree = NULL; tf = NULL; done = FALSE; - payload_len = tvb_captured_length(tvb); + payload_len = tvb_length(tvb); /* Set up the initial NEGOEX payload */ if (tree) { @@ -461,7 +461,7 @@ dissect_negoex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ msg_tvb = tvb_new_subset(tvb, start_offset, - MIN(message_len, tvb_captured_length(tvb)), + MIN(message_len, tvb_length(tvb)), message_len); switch (message_type) { |