H.225.0 updated to 05/2006, Amendment 1 01/2007

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20807 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/h225/H323-MESSAGES.asn b/asn1/h225/H323-MESSAGES.asn
index 1a6b4558350ff89b93a15c99a410e909aa9b0b52..9833dbc3abb2de478f0066cd1ec0c9fdc35a9e82 100644 (file)
--- a/asn1/h225/H323-MESSAGES.asn
+++ b/asn1/h225/H323-MESSAGES.asn
@@ -1,12 +1,12 @@
 -- H323-MESSAGES.asn
 --
 -- Taken from ITU ASN.1 database
--- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h225-0/2006/H323-MESSAGES.asn
+-- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h225-0/2006-amd1/H323-MESSAGES.asn
 --
 -- $Id$
 --
 
--- Module H323-MESSAGES (H.225.0:05/2006)
+-- Module H323-MESSAGES (H.225.0:05/2006, Amendment 1:01/2007)
 H323-MESSAGES DEFINITIONS AUTOMATIC TAGS ::=
 BEGIN
 
@@ -439,11 +439,14 @@ SetupAcknowledge-UUIE ::= SEQUENCE {
 }
 
 Notify-UUIE ::= SEQUENCE {
-  protocolIdentifier  ProtocolIdentifier,
-  callIdentifier      CallIdentifier,
-  tokens              SEQUENCE OF ClearToken OPTIONAL,
-  cryptoTokens        SEQUENCE OF CryptoH323Token OPTIONAL,
-  ...
+  protocolIdentifier        ProtocolIdentifier,
+  callIdentifier            CallIdentifier,
+  tokens                    SEQUENCE OF ClearToken OPTIONAL,
+  cryptoTokens              SEQUENCE OF CryptoH323Token OPTIONAL,
+  ...,
+  connectedAddress          SEQUENCE OF AliasAddress OPTIONAL,
+  presentationIndicator     PresentationIndicator OPTIONAL,
+  screeningIndicator        ScreeningIndicator OPTIONAL
 }
 
 -- Beginning of common message elements section

diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index b1ac701aae906783d821529e7eb35e7275265aa4..29ba87afbfdb44cc527e3d08fc9df8e8d671984e 100644 (file)
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -4501,6 +4501,9 @@ static const per_sequence_t Notify_UUIE_sequence[] = {
   { &hf_h225_callIdentifier , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_h225_CallIdentifier },
   { &hf_h225_tokens         , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h225_SEQUENCE_OF_ClearToken },
   { &hf_h225_cryptoTokens   , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_h225_SEQUENCE_OF_CryptoH323Token },
+  { &hf_h225_connectedAddress, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL    , dissect_h225_SEQUENCE_OF_AliasAddress },
+  { &hf_h225_presentationIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL    , dissect_h225_PresentationIndicator },
+  { &hf_h225_screeningIndicator, ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL    , dissect_h225_ScreeningIndicator },
   { NULL, 0, 0, NULL }
 };