diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2011-02-22 10:23:44 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2011-02-22 10:23:44 +0000 |
| commit | d9ef8f9ad1ff59faf245c93814fcfa7fd69339a6 (patch) | |
| tree | 2149f3f37cce72dcb6e375ce741b83c0eaac8e18 /epan/dissectors/packet-p1.h | |
| parent | 4dd920a9aa5a46e6bb69d467c8afa39687621ed9 (diff) | |
Ensure we always have a valid top_tree for p1.content. This fixes a problem
with other dissectors using p1.content, such as p7.
Reset global content_type_id so this will be correct in more cases.
This is still not a good solution, because ContentType and Content are
generic objects which may occur individual in P7.
Indicate when to report invalid content-type.
svn path=/trunk/; revision=36025
Diffstat (limited to 'epan/dissectors/packet-p1.h')
| -rw-r--r-- | epan/dissectors/packet-p1.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-p1.h b/epan/dissectors/packet-p1.h index e6df43d822..a24ac0284d 100644 --- a/epan/dissectors/packet-p1.h +++ b/epan/dissectors/packet-p1.h @@ -174,6 +174,7 @@ /*--- End of included file: packet-p1-val.h ---*/ #line 30 "packet-p1-template.h" +void p1_initialize_content_globals (proto_tree *tree, gboolean report_unknown_cont_type); char* p1_get_last_oraddress(void); void dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree); @@ -231,7 +232,7 @@ int dissect_p1_TeletexNonBasicParameters(gboolean implicit_tag _U_, tvbuff_t *tv int dissect_p1_SecurityLabel(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); /*--- End of included file: packet-p1-exp.h ---*/ -#line 34 "packet-p1-template.h" +#line 35 "packet-p1-template.h" void proto_reg_handoff_p1(void); void proto_register_p1(void); |