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 /asn1/p7 | |
| 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 'asn1/p7')
| -rw-r--r-- | asn1/p7/p7.cnf | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/asn1/p7/p7.cnf b/asn1/p7/p7.cnf index 487f6f7c2e..fe2fba6624 100644 --- a/asn1/p7/p7.cnf +++ b/asn1/p7/p7.cnf @@ -402,3 +402,17 @@ RTSE-apdus B "2.6.0.2.10""id-as-ms-rtse" col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (count=%%d)", count); } +#.FN_BODY MSMessageSubmissionArgument + p1_initialize_content_globals (tree, TRUE); + %(DEFAULT_BODY)s + p1_initialize_content_globals (NULL, FALSE); + +#.FN_BODY EntryInformation + p1_initialize_content_globals (NULL, FALSE); + %(DEFAULT_BODY)s + p1_initialize_content_globals (NULL, FALSE); + +#.FN_BODY EntryModification + p1_initialize_content_globals (NULL, FALSE); + %(DEFAULT_BODY)s + p1_initialize_content_globals (NULL, FALSE); |