diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-09-08 09:11:21 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-09-08 09:11:21 +0000 |
| commit | 3d2e307ae611770073d9f156a756d5049fa834d4 (patch) | |
| tree | b1ad5b44d7192f47fd1a19ea51048590386599cb | |
| parent | 3b3ea47176d49ec6bf8e26d73b30da7b2856605b (diff) | |
From Alex Lindberg:
Update to h248v3.asn
Applied the change from the Amendment 1 by hand.
svn path=/trunk/; revision=29787
| -rw-r--r-- | asn1/h248/h248v3.asn | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-h248.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-h248.h | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/asn1/h248/h248v3.asn b/asn1/h248/h248v3.asn index 804ef5da14..06a48b8df5 100644 --- a/asn1/h248/h248v3.asn +++ b/asn1/h248/h248v3.asn @@ -1,6 +1,9 @@ MEDIA-GATEWAY-CONTROL {itu-t(0) recommendation(0) h(8) h248(248) modules(0) media-gateway-control(0) version3(3)} -- +-- Module MEDIA-GATEWAY-CONTROL (H.248.1:09/2005) +-- See also ITU-T H.248.1 v3 (2005) Amend. 1 (05/2008) +-- -- $Id$ --DEFINITIONS AUTOMATIC TAGS ::= --BEGIN @@ -274,7 +277,7 @@ BEGIN onewayexternal(0), onewayboth(1), ... - } + } OPTIONAL } AmmRequest ::= SEQUENCE diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 2eef6a6a3c..7a5bcc77fd 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h248.c */ -/* ../../tools/asn2wrs.py -b -p h248 -c h248.cnf -s packet-h248-template h248v3.asn */ +/* ../../tools/asn2wrs.py -b -p h248 -c ./h248.cnf -s ./packet-h248-template -D . h248v3.asn */ /* Input file: packet-h248-template.c */ @@ -2183,7 +2183,7 @@ static const ber_sequence_t TopologyRequest_sequence[] = { { &hf_h248_terminationTo , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_h248_TerminationID }, { &hf_h248_topologyDirection, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_h248_T_topologyDirection }, { &hf_h248_streamID , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_h248_StreamID }, - { &hf_h248_topologyDirectionExtension, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_h248_T_topologyDirectionExtension }, + { &hf_h248_topologyDirectionExtension, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_h248_T_topologyDirectionExtension }, { NULL, 0, 0, 0, NULL } }; @@ -6428,7 +6428,7 @@ void proto_register_h248(void) { NULL, HFILL }}, /*--- End of included file: packet-h248-hfarr.c ---*/ -#line 1427 "packet-h248-template.c" +#line 1426 "packet-h248-template.c" GCP_HF_ARR_ELEMS("h248",h248_arrel) @@ -6590,7 +6590,7 @@ void proto_register_h248(void) { &ett_h248_Value, /*--- End of included file: packet-h248-ettarr.c ---*/ -#line 1445 "packet-h248-template.c" +#line 1444 "packet-h248-template.c" }; module_t *h248_module; diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h index 60a4a6f3b6..d168a57923 100644 --- a/epan/dissectors/packet-h248.h +++ b/epan/dissectors/packet-h248.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-h248.h */ -/* ../../tools/asn2wrs.py -b -p h248 -c h248.cnf -s packet-h248-template h248v3.asn */ +/* ../../tools/asn2wrs.py -b -p h248 -c ./h248.cnf -s ./packet-h248-template -D . h248v3.asn */ /* Input file: packet-h248-template.h */ |