aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2007-05-06 08:18:44 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2007-05-06 08:18:44 +0000
commit2e96e3fe550c1f350a5b2e93bcc6afe321bcb9db (patch)
tree42d1a33d0075b97fb642f17377926b83495a44b5 /epan/dissectors
parent9efc4469ddaf02ba15da8dabd0b936cdc62770a8 (diff)
Separate field for the elements of a constructed OCTET STRING.
svn path=/trunk/; revision=21695
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-ber.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index d3ea762c08..675dd72020 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -106,6 +106,7 @@ static gint hf_ber_unknown_GeneralizedTime = -1;
static gint hf_ber_unknown_INTEGER = -1;
static gint hf_ber_unknown_BITSTRING = -1;
static gint hf_ber_unknown_ENUMERATED = -1;
+static gint hf_ber_constructed_OCTETSTRING = -1;
static gint hf_ber_direct_reference = -1; /* OBJECT_IDENTIFIER */
static gint hf_ber_indirect_reference = -1; /* INTEGER */
static gint hf_ber_data_value_descriptor = -1; /* ObjectDescriptor */
@@ -813,7 +814,7 @@ reassemble_octet_string(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
while(!fd_head) {
- offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, offset, hf_ber_unknown_OCTETSTRING, &next_tvb);
+ offset = dissect_ber_octet_string(FALSE, pinfo, tree, tvb, offset, hf_ber_constructed_OCTETSTRING, &next_tvb);
if (next_tvb == NULL) {
/* Assume that we have a malformed packet. */
@@ -2851,6 +2852,9 @@ proto_register_ber(void)
{ &hf_ber_unknown_ENUMERATED, {
"ENUMERATED", "ber.unknown.ENUMERATED", FT_UINT32, BASE_DEC,
NULL, 0, "This is an unknown ENUMERATED", HFILL }},
+ { &hf_ber_constructed_OCTETSTRING, {
+ "OCTETSTRING", "ber.constructed.OCTETSTRING", FT_BYTES, BASE_HEX,
+ NULL, 0, "This is a component of an constructed OCTETSTRING", HFILL }},
{ &hf_ber_direct_reference,
{ "direct-reference", "ber.direct_reference",
FT_OID, BASE_NONE, NULL, 0,