diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-18 18:09:58 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-06-18 16:15:42 +0000 |
| commit | e308e7c4de81c2ff7159e444b865ac59de4faa2b (patch) | |
| tree | e24dcf58137a30395cc0ce87f1e84e2b32d6a34b /asn1/cmp | |
| parent | b5a462b087bdd7670e1a69786ebbe3f073084ac3 (diff) | |
Update ASN.1 source files with the API changes done in g021e7af
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88
Reviewed-on: https://code.wireshark.org/review/2385
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'asn1/cmp')
| -rw-r--r-- | asn1/cmp/packet-cmp-template.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c index bcb8f6386c..2fc1ff0351 100644 --- a/asn1/cmp/packet-cmp-template.c +++ b/asn1/cmp/packet-cmp-template.c @@ -147,9 +147,9 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa switch(pdu_type){ case CMP_TYPE_PKIMSG: - next_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), pdu_len); + next_tvb = tvb_new_subset(tvb, offset, tvb_captured_length_remaining(tvb, offset), pdu_len); dissect_cmp_pdu(next_tvb, tree, &asn1_ctx); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); break; case CMP_TYPE_POLLREP: proto_tree_add_item(tcptrans_tree, hf_cmp_tcptrans_poll_ref, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -175,14 +175,14 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa proto_tree_add_time(tcptrans_tree, hf_cmp_tcptrans_ttcb, tvb, offset, 4, &ts); offset += 4; - next_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), pdu_len); + next_tvb = tvb_new_subset(tvb, offset, tvb_captured_length_remaining(tvb, offset), pdu_len); dissect_cmp_pdu(next_tvb, tree, &asn1_ctx); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); break; case CMP_TYPE_FINALMSGREP: - next_tvb = tvb_new_subset(tvb, offset, tvb_length_remaining(tvb, offset), pdu_len); + next_tvb = tvb_new_subset(tvb, offset, tvb_captured_length_remaining(tvb, offset), pdu_len); dissect_cmp_pdu(next_tvb, tree, &asn1_ctx); - offset += tvb_length_remaining(tvb, offset); + offset += tvb_captured_length_remaining(tvb, offset); break; case CMP_TYPE_ERRORMSGREP: /*XXX to be added*/ @@ -259,7 +259,7 @@ dissect_cmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void tcp_dissect_pdus(tvb, pinfo, parent_tree, cmp_desegment, offset, get_cmp_pdu_len, dissect_cmp_tcp_pdu, data); - return tvb_length(tvb); + return tvb_captured_length(tvb); } |