diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-01-28 10:12:51 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-01-28 10:12:51 +0000 |
| commit | 428435dcd8649134c979f6e185eb665c8604a0ff (patch) | |
| tree | 7335340b4967f61805af3ca82b8b021e61e490a7 /asn1 | |
| parent | 197c6c99958453b19f57db530b27ebe4945675b2 (diff) | |
Fix for per-domain-bilateral-information (bilateral-information field wasn't handled).
svn path=/trunk/; revision=20583
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/x411/packet-x411-template.c | 2 | ||||
| -rw-r--r-- | asn1/x411/x411.asn | 3 | ||||
| -rw-r--r-- | asn1/x411/x411.cnf | 14 |
3 files changed, 18 insertions, 1 deletions
diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c index cfe2be393c..307ed8c7aa 100644 --- a/asn1/x411/packet-x411-template.c +++ b/asn1/x411/packet-x411-template.c @@ -76,6 +76,7 @@ call_x411_oid_callback(char *base_oid, tvbuff_t *tvb, int offset, packet_info *p /* Initialize the subtree pointers */ static gint ett_x411 = -1; static gint ett_x411_content_unknown = -1; +static gint ett_x411_bilateral_information = -1; #include "packet-x411-ett.c" #include "packet-x411-fn.c" @@ -212,6 +213,7 @@ void proto_register_x411(void) { static gint *ett[] = { &ett_x411, &ett_x411_content_unknown, + &ett_x411_bilateral_information, #include "packet-x411-ettarr.c" }; diff --git a/asn1/x411/x411.asn b/asn1/x411/x411.asn index 6828d00b55..241957b8b2 100644 --- a/asn1/x411/x411.asn +++ b/asn1/x411/x411.asn @@ -386,7 +386,8 @@ PerDomainBilateralInformation ::= SEQUENCE { SEQUENCE {administration-domain-name [0] AdministrationDomainName, private-domain-identifier - [1] PrivateDomainIdentifier}} + [1] PrivateDomainIdentifier}}, + bilateral-information ANY } MTARecipientName ::= ORAddressAndOptionalDirectoryName diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf index b5b50338d0..f649b593c4 100644 --- a/asn1/x411/x411.cnf +++ b/asn1/x411/x411.cnf @@ -681,5 +681,19 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" offset=call_x411_oid_callback("x411.tokendata", tvb, offset, pinfo, tree); +#.FN_BODY T_bilateral_information + proto_item *item = NULL; + int loffset = 0; + guint32 len = 0; + /* work out the length */ + loffset = dissect_ber_identifier(pinfo, tree, tvb, offset, NULL, NULL, NULL); + (void) dissect_ber_length(pinfo, tree, tvb, loffset, &len, NULL); + + /* create some structure so we can tell what this unknown ASN.1 represents */ + item = proto_tree_add_item(tree, hf_index, tvb, offset, len, FALSE); + tree = proto_item_add_subtree(item, ett_x411_bilateral_information); + + offset = dissect_unknown_ber(pinfo, tvb, offset, tree); + #.END |