diff options
| author | Roland Knall <roland.knall@br-automation.com> | 2015-04-14 09:32:17 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-04-14 16:27:58 +0000 |
| commit | 311758aff7b21d877addac447d9216a22bc1af5e (patch) | |
| tree | d4e0c355883ed75fe1d5b464beda2f982813704c /epan/dissectors/packet-opensafety.c | |
| parent | b9ce255353c44c3cf6bc710304dc5fb8be0f45d9 (diff) | |
openSAFETY: Replace deprecated API
Replace deprecated API functions tvb_length and tvb_length_remaining
Change-Id: Ibf4c7b12a1a6ea3b1a750dce7faf2f4933b4c470
Reviewed-on: https://code.wireshark.org/review/8063
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
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 98208d397c..ed1c4cf520 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -765,7 +765,7 @@ static void dissect_opensafety_ssdo_payload ( packet_info *pinfo, tvbuff_t *new_ proto_item *item; proto_tree *sod_tree, *ext_tree; - dataLength = tvb_length(new_tvb); + dataLength = tvb_captured_length(new_tvb); ssdoIndex = tvb_get_letohs(new_tvb, 0); @@ -1775,7 +1775,7 @@ opensafety_package_dissector(const gchar *protocolName, const gchar *sub_diss_ha next_tvb = NULL; /* Smallest possible frame size is 11 */ - if ( tvb_length_remaining(message_tvb, frameOffset ) < OSS_MINIMUM_LENGTH ) + if ( tvb_captured_length_remaining(message_tvb, frameOffset ) < OSS_MINIMUM_LENGTH ) break; /* Finding the start of the first possible safety frame */ @@ -2124,7 +2124,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_length ( message_tvb ) < OSS_MINIMUM_LENGTH ) + if ( tvb_captured_length ( message_tvb ) < OSS_MINIMUM_LENGTH ) return result; /* More than one openSAFETY package could be transported in the same frame, |