diff options
Diffstat (limited to 'epan/dissectors/packet-h248.c')
| -rw-r--r-- | epan/dissectors/packet-h248.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index d646e4c050..df1cf437d3 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1280,7 +1280,7 @@ static int dissect_h248_trx_id(gboolean implicit_tag, packet_info *pinfo, proto_ offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &ber_class, &pc, &tag); offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL); } else { - len=tvb_length_remaining(tvb, offset); + len=tvb_reported_length_remaining(tvb, offset); } @@ -1318,7 +1318,7 @@ static int dissect_h248_ctx_id(gboolean implicit_tag, packet_info *pinfo, proto_ offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &ber_class, &pc, &tag); offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL); } else { - len=tvb_length_remaining(tvb, offset); + len=tvb_reported_length_remaining(tvb, offset); } @@ -1712,7 +1712,7 @@ static int dissect_h248_SigParameterName(gboolean implicit_tag _U_, tvbuff_t *tv offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &next_tvb); pi = actx->created_item; - switch(tvb_length(next_tvb)) { + switch(tvb_reported_length(next_tvb)) { case 4: param_id = tvb_get_ntohl(next_tvb,0); break; case 3: param_id = tvb_get_ntoh24(next_tvb,0); break; case 2: param_id = tvb_get_ntohs(next_tvb,0); break; @@ -1785,7 +1785,7 @@ static int dissect_h248_EventParameterName(gboolean implicit_tag _U_, tvbuff_t * pi = actx->created_item; if (next_tvb) { - switch(tvb_length(next_tvb)) { + switch(tvb_reported_length(next_tvb)) { case 4: param_id = tvb_get_ntohl(next_tvb,0); break; case 3: param_id = tvb_get_ntoh24(next_tvb,0); break; case 2: param_id = tvb_get_ntohs(next_tvb,0); break; @@ -1864,7 +1864,7 @@ static int dissect_h248_MtpAddress(gboolean implicit_tag, tvbuff_t *tvb, int off if (new_tvb) { /* this field is either 2 or 4 bytes so just read it into an integer */ val=0; - len=tvb_length(new_tvb); + len=tvb_reported_length(new_tvb); for(i=0;i<len;i++){ val= (val<<8)|tvb_get_guint8(new_tvb, i); } @@ -5412,7 +5412,7 @@ dissect_h248(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect with the "megaco" dissector in Wireshark. (Both encodings are MEGACO (RFC 3015) and both are H.248.) */ - if(tvb_length(tvb)>=6){ + if(tvb_captured_length(tvb)>=6){ if(!tvb_strneql(tvb, 0, "MEGACO", 6)){ static dissector_handle_t megaco_handle=NULL; if(!megaco_handle){ |