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-dec-dnart.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-dec-dnart.c')
| -rw-r--r-- | epan/dissectors/packet-dec-dnart.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 1b7d1be171..bd8761ed51 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -624,7 +624,7 @@ do_hello_test_msg( proto_tree_add_item(tree, hf_dec_rt_src_node, tvb, my_offset, 2, ENC_LITTLE_ENDIAN); my_offset += 2; - remainder_count = tvb_captured_length_remaining(tvb, my_offset); + remainder_count = tvb_length_remaining(tvb, my_offset); if (remainder_count != 0) { proto_tree_add_item(tree, hf_dec_rt_test_data, tvb, my_offset, remainder_count, ENC_NA); @@ -651,7 +651,7 @@ do_routing_msg( my_offset, 2, ENC_LITTLE_ENDIAN); /* Skip the 1-byte reserved field */ my_offset += 3; - remainder_count = tvb_captured_length_remaining(tvb, my_offset); + remainder_count = tvb_length_remaining(tvb, my_offset); do { /* if the remainder_count == 1, only the checksum remains */ count = tvb_get_letohs(tvb, my_offset); @@ -1034,7 +1034,7 @@ handle_nsp_msg( (ack_num & 0x1000) ? "NAK" : "ACK", ack_num & 0xfff); - if (tvb_captured_length_remaining(tvb, my_offset) > 0) { + if (tvb_length_remaining(tvb, my_offset) > 0) { ack_oth = tvb_get_letohs(tvb, my_offset); if (ack_oth & 0x8000) { /* There is an ack_oth field */ @@ -1058,7 +1058,7 @@ handle_nsp_msg( ack_num & 0xfff); my_offset += 2; /* There may be an optional ack_dat field */ - if (tvb_captured_length_remaining(tvb, my_offset) > 0) { + if (tvb_length_remaining(tvb, my_offset) > 0) { ack_dat = tvb_get_letohs(tvb, my_offset); if (ack_dat & 0x8000) { /* There is an ack_dat field */ |