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-opensafety.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-opensafety.c')
| -rw-r--r-- | epan/dissectors/packet-opensafety.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index 119a944c8d..4b2d14943f 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -1010,7 +1010,7 @@ static void dissect_ssdo_payload ( packet_info *pinfo, tvbuff_t *new_tvb, proto_ proto_item *item; proto_tree *sod_tree, *ext_tree; - dataLength = tvb_captured_length(new_tvb); + dataLength = tvb_length(new_tvb); ssdoIndex = tvb_get_letohs(new_tvb, 0); @@ -2006,7 +2006,7 @@ opensafety_package_dissector(const gchar *protocolName, const gchar *sub_diss_ha next_tvb = NULL; /* Smallest possible frame size is 11 */ - if ( tvb_captured_length_remaining(message_tvb, frameOffset ) < OSS_MINIMUM_LENGTH ) + if ( tvb_length_remaining(message_tvb, frameOffset ) < OSS_MINIMUM_LENGTH ) break; /* Finding the start of the first possible safety frame */ @@ -2352,7 +2352,7 @@ dissect_opensafety_udpdata(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree return result; /* An openSAFETY frame has at least OSS_MINIMUM_LENGTH bytes */ - if ( tvb_captured_length ( message_tvb ) < OSS_MINIMUM_LENGTH ) + if ( tvb_length ( message_tvb ) < OSS_MINIMUM_LENGTH ) return result; /* More than one openSAFETY package could be transported in the same frame, |