diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-22 09:59:50 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-22 20:43:34 +0000 |
| commit | be6fb606915f4ccc68a62195619d176cd62f79f9 (patch) | |
| tree | edd4b63c557923d1196dd779ac91ee1e1bae90ef /epan/dissectors/packet-skype.c | |
| parent | 45872b9f7bf10476e48187f4b699c6f44943f22a (diff) | |
Remove a bunch of deprecated tvb_length calls
Change-Id: I9362e0fdc4519ba5f3d656152966e7030f478839
Reviewed-on: https://code.wireshark.org/review/9022
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-skype.c')
| -rw-r--r-- | epan/dissectors/packet-skype.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-skype.c b/epan/dissectors/packet-skype.c index 1e5ccf736c..8e2940ea28 100644 --- a/epan/dissectors/packet-skype.c +++ b/epan/dissectors/packet-skype.c @@ -132,7 +132,7 @@ dissect_skype_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* XXX: Just until we know how to decode skype over tcp */ packet_type = 255; - packet_length = tvb_length(tvb); + packet_length = tvb_captured_length(tvb); col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME); col_add_str(pinfo->cinfo, COL_INFO, val_to_str(packet_type, @@ -187,7 +187,7 @@ dissect_skype_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) packet_type = tvb_get_guint8(tvb, 2) & SKYPE_SOM_TYPE_MASK; packet_unk = (tvb_get_guint8(tvb, 2) & SKYPE_SOM_UNK_MASK) >> 4; - packet_length = tvb_length(tvb); + packet_length = tvb_captured_length(tvb); col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME); col_add_str(pinfo->cinfo, COL_INFO, val_to_str(packet_type, @@ -292,7 +292,7 @@ static gboolean test_skype_udp(tvbuff_t *tvb) { /* Minimum of 3 bytes, check for valid message type */ - guint length = tvb_length(tvb); + guint length = tvb_captured_length(tvb); guint8 type = tvb_get_guint8(tvb, 2) & 0xF; if ( length >= 3 && ( type == 0 || |