diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-01-13 21:09:45 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-01-13 21:09:45 +0000 |
| commit | 94a2b9a789e363b0306b2e8d91c947e472bc39fc (patch) | |
| tree | 43f539f652a3f57370093453652af11ecaa1336d | |
| parent | cb9be2d997e71b13eecd61344a01bc2553a813c9 (diff) | |
Minor bug fixes and export functions needed by h450
svn path=/trunk/; revision=13022
| -rw-r--r-- | asn1/h225/h225-exp.cnf | 3 | ||||
| -rw-r--r-- | asn1/h225/h225.cnf | 9 | ||||
| -rw-r--r-- | asn1/h225/packet-h225-template.c | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/asn1/h225/h225-exp.cnf b/asn1/h225/h225-exp.cnf index 6518f1f3a5..23700e3bcd 100644 --- a/asn1/h225/h225-exp.cnf +++ b/asn1/h225/h225-exp.cnf @@ -1,6 +1,9 @@ #.TYPE_ATTR +PresentationIndicator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PresentationIndicator_vals) BITMASK = 0 +ScreeningIndicator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_ScreeningIndicator_vals) BITMASK = 0 NonStandardParameter TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 AliasAddress TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(AliasAddress_vals) BITMASK = 0 +PartyNumber TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(h225_PartyNumber_vals) BITMASK = 0 RasMessage TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(RasMessage_vals) BITMASK = 0 #.END diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 40d09fb958..bff7680817 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -30,6 +30,9 @@ AdmissionRejectReason ONLY_VALS ETH_VAR NO_PROT_PREFIX LocationRejectReason ONLY_VALS ETH_VAR NO_PROT_PREFIX RegistrationRejectReason ONLY_VALS ETH_VAR NO_PROT_PREFIX AliasAddress NO_PROT_PREFIX +PartyNumber +PresentationIndicator +ScreeningIndicator #---------------------------------------------------------------------------------------- #.TYPE_RENAME CallCreditServiceControl/callStartingPoint CallCreditServiceControl_callStartingPoint @@ -394,5 +397,7 @@ guint32 value_len; H221NonStandard/t35CountryCode TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(T35CountryCode_vals) TransportAddress/ipAddress/ip TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL TransportAddress/ip6Address/ip TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL -H245TransportAddress/h245ipAddress/h245ipv TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL -H245TransportAddress/h245ip6Address/h245ipv6 TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL
\ No newline at end of file +H245TransportAddress/h245ipAddress/h245ipv4 TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL +H245TransportAddress/h245ip6Address/h245ipv6 TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL +VendorIdentifier/productId TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL +VendorIdentifier/versionId TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL
\ No newline at end of file diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index 999535203e..c9fa1cc8bb 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -2,7 +2,7 @@ * Routines for h225 packet dissection * Copyright 2005, Anders Broman <anders.broman@ericsson.com> * - * $Id: packet-h225-template.c 12203 2004-10-05 09:18:55Z guy $ + * $Id$ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -226,6 +226,7 @@ void proto_register_h225(void) { register_init_routine(&h225_init_routine); h225_tap = register_tap("h225"); register_ber_oid_name("0.0.8.2250.0.2","itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 2"); + register_ber_oid_name("0.0.8.2250.0.4","itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 4"); } |