aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/c1222
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2014-06-18 18:09:58 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2014-06-18 16:15:42 +0000
commite308e7c4de81c2ff7159e444b865ac59de4faa2b (patch)
treee24dcf58137a30395cc0ce87f1e84e2b32d6a34b /asn1/c1222
parentb5a462b087bdd7670e1a69786ebbe3f073084ac3 (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/c1222')
-rw-r--r--asn1/c1222/packet-c1222-template.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c
index af28be358d..f21a79fa27 100644
--- a/asn1/c1222/packet-c1222-template.c
+++ b/asn1/c1222/packet-c1222-template.c
@@ -947,7 +947,7 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_
case EAX_MODE_CIPHERTEXT_AUTH:
/* mode is ciphertext with authentication */
hasmac = TRUE;
- len2 = tvb_length_remaining(tvb, offset);
+ len2 = tvb_captured_length_remaining(tvb, offset);
if (len2 <= 0)
return offset;
encrypted = TRUE;
@@ -967,7 +967,7 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_
case EAX_MODE_CLEARTEXT_AUTH:
/* mode is cleartext with authentication */
hasmac = TRUE;
- len2 = tvb_length_remaining(tvb, offset);
+ len2 = tvb_captured_length_remaining(tvb, offset);
if (len2 <= 0)
return offset;
buffer = (guchar *)tvb_memdup(wmem_packet_scope(), tvb, offset, len2);
@@ -1072,7 +1072,7 @@ dissect_c1222_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
dissect_MESSAGE_PDU(tvb, pinfo, c1222_tree);
}
- return tvb_length(tvb);
+ return tvb_captured_length(tvb);
}
/**
@@ -1108,7 +1108,7 @@ dissect_c1222(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
{
tcp_dissect_pdus(tvb, pinfo, tree, c1222_desegment, 5,
get_c1222_message_len, dissect_c1222_common, data);
- return tvb_length(tvb);
+ return tvb_captured_length(tvb);
}
/*--- proto_register_c1222 -------------------------------------------*/