diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-05-13 22:01:17 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-05-13 22:01:17 +0000 |
| commit | 0bc558f88d9247755acf74131c95317ef0d60ef3 (patch) | |
| tree | ca1da7cfc6555c57efc6ad2cae350ad436892af8 /epan/dissectors | |
| parent | 0a0a913a0159a5a8418fd2f3805ba1c65fdf4f72 (diff) | |
actx in ber_external
svn path=/trunk/; revision=21755
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-ber.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-ber.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index a91e8f71da..49354ef20d 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -2726,9 +2726,8 @@ dissect_ber_external(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_ } int -dissect_ber_external_type(gboolean implicit_tag, packet_info *pinfo _U_, proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, gint hf_id, ber_callback func){ +dissect_ber_external_type(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, gint hf_id, ber_callback func){ - asn1_ctx_clean_external(actx); actx->external.ber.ber_callback = func; offset = dissect_ber_external(implicit_tag, tvb, offset, actx, parent_tree, hf_id); diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index eeb0d5d32b..52be08048a 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -115,6 +115,7 @@ extern int dissect_ber_null(gboolean implicit_tag, packet_info *pinfo, proto_tre extern int dissect_ber_boolean(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id); extern int dissect_ber_boolean_value(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, gboolean *value); +extern int dissect_ber_external_type(gboolean implicit_tag, asn1_ctx_t *actx, proto_tree *parent_tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, gint hf_id, ber_callback func){ #define BER_FLAGS_OPTIONAL 0x00000001 #define BER_FLAGS_IMPLTAG 0x00000002 |