diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-01-23 20:50:18 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-01-23 20:50:18 +0000 |
| commit | 59e4794390f43cd3e90dd81f292294a077f9b142 (patch) | |
| tree | 219bf0739a661aec08d57c5586c03158231e7230 /epan | |
| parent | 469232d0620a82cad8e93b143e12e5613f0ebc55 (diff) | |
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8216 :
Add basic dissection of UTF8String type in ASN.1 PER dissector
svn path=/trunk/; revision=47233
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-per.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-per.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index add5e387d4..a0d2d2c685 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -783,6 +783,13 @@ dissect_per_BMPString(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tre return offset; } +guint32 +dissect_per_UTF8String(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension _U_) +{ + offset=dissect_per_restricted_character_string_sorted(tvb, offset, actx, tree, + hf_index, min_len, max_len, has_extension, NULL, 256, NULL); + return offset; +} guint32 dissect_per_object_descriptor(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, tvbuff_t **value_tvb) diff --git a/epan/dissectors/packet-per.h b/epan/dissectors/packet-per.h index 6416d20e77..29b01a4d9c 100644 --- a/epan/dissectors/packet-per.h +++ b/epan/dissectors/packet-per.h @@ -81,6 +81,8 @@ extern guint32 dissect_per_VisibleString(tvbuff_t *tvb, guint32 offset, asn1_ctx extern guint32 dissect_per_BMPString(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension); +extern guint32 dissect_per_UTF8String(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension); + extern guint32 dissect_per_object_descriptor(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, tvbuff_t **value_tvb); extern guint32 dissect_per_constrained_sequence_of(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *parent_tree, int hf_index, gint ett_index, const per_sequence_t *seq, int min_len, int max_len, gboolean has_extension); |