diff options
| author | Evan Huus <eapache@gmail.com> | 2014-06-20 17:36:59 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-06-21 04:01:52 +0000 |
| commit | 37b903d7abab78a6f13b61feb88f62f2fa638151 (patch) | |
| tree | cc35bbf35e846d55bf7c03936d5e43329f7b642a /epan/dissectors/packet-p1.c | |
| parent | 3773a7561c79e3545fca664c2a25cf2312de0ada (diff) | |
batch of tvb-length conversions
Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498
Reviewed-on: https://code.wireshark.org/review/2507
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-p1.c')
| -rw-r--r-- | epan/dissectors/packet-p1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c index 2dec852ecd..d19eb99aa7 100644 --- a/epan/dissectors/packet-p1.c +++ b/epan/dissectors/packet-p1.c @@ -922,7 +922,7 @@ static void do_address(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx) wmem_strbuf_append(ctx->oraddress, addr); } if (tvb_string) { - wmem_strbuf_append(ctx->oraddress, tvb_format_text(tvb_string, 0, tvb_length(tvb_string))); + wmem_strbuf_append(ctx->oraddress, tvb_format_text(tvb_string, 0, tvb_captured_length(tvb_string))); } } @@ -936,7 +936,7 @@ static void do_address_str(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* a do_address(addr, tvb_string, actx); if (ctx && ctx->do_address && ddatype && tvb_string) - wmem_strbuf_append(ddatype, tvb_format_text(tvb_string, 0, tvb_length(tvb_string))); + wmem_strbuf_append(ddatype, tvb_format_text(tvb_string, 0, tvb_captured_length(tvb_string))); } static void do_address_str_tree(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx, proto_tree* tree) @@ -948,7 +948,7 @@ static void do_address_str_tree(const char* addr, tvbuff_t* tvb_string, asn1_ctx if (ctx && ctx->do_address && tvb_string && ddatype) { if (wmem_strbuf_get_len(ddatype) > 0) { - proto_item_append_text (tree, " (%s=%s)", wmem_strbuf_get_str(ddatype), tvb_format_text(tvb_string, 0, tvb_length(tvb_string))); + proto_item_append_text (tree, " (%s=%s)", wmem_strbuf_get_str(ddatype), tvb_format_text(tvb_string, 0, tvb_captured_length(tvb_string))); } } } @@ -8393,7 +8393,7 @@ dissect_p1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* dat break; default: proto_tree_add_text(tree, tvb, offset, -1,"Unsupported P1 PDU"); - return tvb_length(tvb); + return tvb_captured_length(tvb); } col_set_str(pinfo->cinfo, COL_INFO, p1_op_name); @@ -8407,7 +8407,7 @@ dissect_p1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* dat } } p1_initialize_content_globals (&asn1_ctx, NULL, FALSE); - return tvb_length(tvb); + return tvb_captured_length(tvb); } |