osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Graeme Lunt 2007-06-27 18:03:23 +00:00
parent 1763f7caa3
commit 12af6d79bc
2 changed files with 576 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
asn1/x411/x411.cnf
View File

@ -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;

687
epan/dissectors/packet-x411.c
View File

File diff suppressed because it is too large Load Diff