diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-06-06 08:12:27 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2007-06-06 08:12:27 +0000 |
| commit | 1dcf2aaef02f98c5fd6190a91e6940300c416fe6 (patch) | |
| tree | 5a51628ac951d038de13d0a8cab037557920ea29 /asn1/x411 | |
| parent | ad07451fd182f1b46e0d51e0a173bfa18a96966a (diff) | |
use ASN.1 type names in #.FN_BODY (instead of Wireshark type names)
svn path=/trunk/; revision=22054
Diffstat (limited to 'asn1/x411')
| -rw-r--r-- | asn1/x411/x411.cnf | 71 |
1 files changed, 51 insertions, 20 deletions
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf index d232d40612..11d2ac36d5 100644 --- a/asn1/x411/x411.cnf +++ b/asn1/x411/x411.cnf @@ -485,12 +485,10 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" g_strlcat(oraddress, tvb_format_text(string, 0, tvb_length(string)), MAX_ORA_STR_LEN); } +#.VIRTUAL_ASSGN +AddrNumericString UserAddress/x121/x121-address CountryName/x121-dcc-code PhysicalDeliveryCountryName/x121-dcc-code PostalCode/numeric-code - -#.FN_PARS NumericString - VAL_PTR=&nstring - -#.FN_BODY NumericString +#.FN_BODY AddrNumericString VAL_PTR=&nstring tvbuff_t *nstring = NULL; %(DEFAULT_BODY)s @@ -498,9 +496,10 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" if(doing_address && nstring) g_strlcat(oraddress, tvb_format_text(nstring, 0, tvb_length(nstring)), MAX_ORA_STR_LEN); -#.FN_PARS TeletexString +#.VIRTUAL_ASSGN +AddrTeletexString TeletexPersonalName/surname TeletexPersonalName/given-name TeletexPersonalName/initials TeletexPersonalName/generation-qualifier TeletexDomainDefinedAttribute/type TeletexDomainDefinedAttribute/value -#.FN_BODY TeletexString +#.FN_BODY AddrTeletexString VAL_PTR=&tstring tvbuff_t *tstring = NULL; %(DEFAULT_BODY)s @@ -509,28 +508,60 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" g_strlcat(oraddress, tvb_format_text(tstring, 0, tvb_length(tstring)), MAX_ORA_STR_LEN); -#.FN_PARS PrintableString - VAL_PTR=&pstring +#.FN_BODY PersonalName/surname VAL_PTR=&pstring + tvbuff_t *pstring = NULL; + + %(DEFAULT_BODY)s -#.FN_BODY PrintableString + if(doing_address && pstring) { + g_strlcat(oraddress, "/S=", MAX_ORA_STR_LEN); + g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); + } +#.FN_BODY PersonalName/given-name VAL_PTR=&pstring tvbuff_t *pstring = NULL; - char *fmt = NULL; %(DEFAULT_BODY)s if(doing_address && pstring) { - if(hf_index == hf_x411_printable_surname) fmt = "/S="; - else if(hf_index == hf_x411_printable_given_name) fmt = "/G="; - else if(hf_index == hf_x411_printable_initials) fmt = "/I="; - else if(hf_index == hf_x411_printable_generation_qualifier) fmt = "/GQ="; - else if(hf_index == hf_x411_printable_type) fmt = "/DD."; - else if(hf_index == hf_x411_printable_value) fmt = "="; - - if(fmt) - g_strlcat(oraddress, fmt, MAX_ORA_STR_LEN); + g_strlcat(oraddress, "/G=", MAX_ORA_STR_LEN); + g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); + } +#.FN_BODY PersonalName/initials VAL_PTR=&pstring + tvbuff_t *pstring = NULL; + + %(DEFAULT_BODY)s + + if(doing_address && pstring) { + g_strlcat(oraddress, "/I=", MAX_ORA_STR_LEN); + g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); + } +#.FN_BODY PersonalName/generation-qualifier VAL_PTR=&pstring + tvbuff_t *pstring = NULL; + + %(DEFAULT_BODY)s + + if(doing_address && pstring) { + g_strlcat(oraddress, "/GQ=", MAX_ORA_STR_LEN); + g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); + } + +#.FN_BODY BuiltInDomainDefinedAttribute/type VAL_PTR=&pstring + tvbuff_t *pstring = NULL; + %(DEFAULT_BODY)s + + if(doing_address && pstring) { + g_strlcat(oraddress, "/DD.", MAX_ORA_STR_LEN); g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); + } +#.FN_BODY BuiltInDomainDefinedAttribute/value VAL_PTR=&pstring + tvbuff_t *pstring = NULL; + %(DEFAULT_BODY)s + + if(doing_address && pstring) { + g_strlcat(oraddress, "=", MAX_ORA_STR_LEN); + g_strlcat(oraddress, tvb_format_text(pstring, 0, tvb_length(pstring)), MAX_ORA_STR_LEN); } #.FN_BODY ORAddress |