Wireshark-commits: [Wireshark-commits] rev 36025: /trunk/ /trunk/epan/dissectors/: packet-p1.c pack
Date: Tue, 22 Feb 2011 10:23:49 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=36025

User: stig
Date: 2011/02/22 02:23 AM

Log:
 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.

Directory: /trunk/epan/dissectors/
  Changes    Path           Action
  +102 -73   packet-p1.c    Modified
  +2 -1      packet-p1.h    Modified
  +14 -3     packet-p7.c    Modified

Directory: /trunk/asn1/p1/
  Changes    Path                    Action
  +18 -1     p1.cnf                  Modified
  +11 -2     packet-p1-template.c    Modified
  +1 -0      packet-p1-template.h    Modified

Directory: /trunk/asn1/p7/
  Changes    Path          Action
  +14 -0     p7.cnf        Modified