diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-06-27 18:03:23 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-06-27 18:03:23 +0000 |
| commit | 12af6d79bceffacfd9bf57c888342f1507967e00 (patch) | |
| tree | 978574ca29894a7b1da6a3f810801cbd2169d45f /asn1/x411 | |
| parent | 1763f7caa3478bae9771c6c78fd4349544ea6df5 (diff) | |
This patch will set correct extension_id for ExtensionAttributeType
(error introduced in r22043), and fix printing of CAP values in
oraddress (error introduced in r22054).
svn path=/trunk/; revision=22209
Diffstat (limited to 'asn1/x411')
| -rw-r--r-- | asn1/x411/x411.cnf | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf index eb44f8414f..47189de42f 100644 --- a/asn1/x411/x411.cnf +++ b/asn1/x411/x411.cnf @@ -40,6 +40,15 @@ ExtensionField/value ExtensionValue SecurityCategory/value CategoryValue #.FIELD_RENAME +CountryName/iso-3166-alpha2-code printable-country-name +CountryName/x121-dcc-code numeric-country-name +AdministrationDomainName/printable printable-administration-domain-name +AdministrationDomainName/numeric numeric-administration-domain-name +PrivateDomainName/printable printable-private-domain-name +PrivateDomainName/numeric numeric-private-domain-name +PrivateDomainIdentifier/printable printable-private-domain-identifier +PrivateDomainIdentifier/numeric numeric-private-domain-identifier + TeletexPersonalName/surname teletex-surname PersonalName/surname printable-surname UniversalPersonalName/surname universal-surname @@ -260,6 +269,9 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" offset = dissect_unknown_ber(actx->pinfo, tvb, offset, tree); +#.FN_PARS ExtensionAttribute/extension-attribute-type + VAL_PTR = &extension_id + #.FN_BODY ExtensionAttribute/extension-attribute-value offset=call_x411_oid_callback("x411.extension-attribute", tvb, offset, actx->pinfo, tree); @@ -499,7 +511,18 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" } #.VIRTUAL_ASSGN -AddrNumericString UserAddress/x121/x121-address CountryName/x121-dcc-code PhysicalDeliveryCountryName/x121-dcc-code PostalCode/numeric-code +AddrPrintableString CountryName/iso-3166-alpha2-code AdministrationDomainName/printable PrivateDomainName/printable PrivateDomainIdentifier/printable + +#.FN_BODY AddrPrintableString VAL_PTR=&nstring + tvbuff_t *nstring = NULL; + + %(DEFAULT_BODY)s + + if(doing_address && nstring) + g_strlcat(oraddress, tvb_format_text(nstring, 0, tvb_length(nstring)), MAX_ORA_STR_LEN); + +#.VIRTUAL_ASSGN +AddrNumericString UserAddress/x121/x121-address CountryName/x121-dcc-code AdministrationDomainName/numeric PrivateDomainName/numeric PrivateDomainIdentifier/numeric PhysicalDeliveryCountryName/x121-dcc-code PostalCode/numeric-code #.FN_BODY AddrNumericString VAL_PTR=&nstring tvbuff_t *nstring = NULL; |